@yrpri/api 9.0.114 → 9.0.116

package/models/index.cjs

@@ -5,6 +5,9 @@ const env = process.env.NODE_ENV || "development";
 const _ = require("lodash");
 const { Sequelize, DataTypes } = require("sequelize");
 let sequelize;
+// -----------------------------------------------------------------------------
+// DB bootstrap
+// -----------------------------------------------------------------------------
 const Op = Sequelize.Op;
 const operatorsAliases = {
     $gt: Op.gt,
@@ -30,25 +33,20 @@ if (process.env.NODE_ENV === "production") {
             dialect: "postgres",
             minifyAliases: true,
             logging: false,
-            operatorsAliases: operatorsAliases,
+            operatorsAliases,
         });
     }
     else {
         sequelize = new Sequelize(process.env.DATABASE_URL, {
             dialect: "postgres",
-            dialectOptions: {
-                ssl: {
-                    rejectUnauthorized: false,
-                },
-            },
+            dialectOptions: { ssl: { rejectUnauthorized: false } },
             minifyAliases: true,
             logging: false,
-            operatorsAliases: operatorsAliases,
+            operatorsAliases,
         });
     }
 }
 else {
-    let config;
     try {
         sequelize = new Sequelize(process.env.YP_DEV_DATABASE_NAME, process.env.YP_DEV_DATABASE_USERNAME, process.env.YP_DEV_DATABASE_PASSWORD, {
             dialect: "postgres",
@@ -56,19 +54,19 @@ else {
             host: process.env.YP_DEV_DATABASE_HOST,
             port: process.env.YP_DEV_DATABASE_PORT,
             minifyAliases: true,
-            dialectOptions: {
-                ssl: false,
-                rejectUnauthorized: false,
-            },
+            dialectOptions: { ssl: false, rejectUnauthorized: false },
             logging: false,
-            operatorsAliases: operatorsAliases,
+            operatorsAliases,
         });
     }
     catch (error) {
-        console.error("Error reading or parsing config file:", error);
+        console.error("Error configuring Sequelize:", error);
         process.exit(1);
     }
 }
+// -----------------------------------------------------------------------------
+// Model loading
+// -----------------------------------------------------------------------------
 const db = {};
 async function createCompoundIndexes(indexCommands) {
     for (const command of indexCommands) {
@@ -77,8 +75,8 @@ async function createCompoundIndexes(indexCommands) {
             console.log(`Successfully created index with command: ${command}`);
         }
         catch (error) {
-            if (error.message.indexOf("already exists") > -1) {
-                //console.log("already exists")
+            if (error.message.includes("already exists")) {
+                /* ignore duplicate index */
             }
             else {
                 console.error(`Error creating index with command: ${command}`);
@@ -148,30 +146,35 @@ const compoundIndexCommands = [
     `CREATE INDEX posts_idx2_counter_sum_group_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,deleted)`,
     `CREATE INDEX posts_idx2_counter_sum_group_id_category_id_deleted ON posts ((counter_endorsements_up-counter_endorsements_down),group_id,category_id,deleted)`,
 ];
-// Read models from local folder
+// Load local models (.cjs only)
 fs.readdirSync(__dirname)
-    .filter((file) => {
-    return file.indexOf(".") !== 0 && file.endsWith(".cjs") && !file.endsWith(".d.cjs") && !file.endsWith(".d.cts") && file !== "index.cjs";
-})
+    .filter((file) => file.indexOf(".") !== 0 &&
+    file.endsWith(".cjs") &&
+    !file.endsWith(".d.cjs") &&
+    !file.endsWith(".d.cts") &&
+    file !== "index.cjs")
     .forEach((file) => {
     const model = require(path.join(__dirname, file))(sequelize, DataTypes);
     db[model.name] = model;
 });
-// Read from active citizen,
-const acDirname = __dirname + "/../services/models";
+// Load from ActiveCitizen services/models (.cjs only)
+const acDirname = path.join(__dirname, "..", "services", "models");
 fs.readdirSync(acDirname)
-    .filter((file) => {
-    return file.indexOf(".") !== 0 && file.endsWith(".cjs") && !file.endsWith(".d.cjs") && !file.endsWith(".d.cts");
-})
+    .filter((file) => file.indexOf(".") !== 0 &&
+    file.endsWith(".cjs") &&
+    !file.endsWith(".d.cjs") &&
+    !file.endsWith(".d.cts"))
     .forEach((file) => {
     const model = require(path.join(acDirname, file))(sequelize, DataTypes);
     db[model.name] = model;
 });
+// Wire up associations
 Object.keys(db).forEach((modelName) => {
     if ("associate" in db[modelName]) {
         db[modelName].associate(db);
     }
 });
+// Sync & index creation
 if (process.env.FORCE_DB_SYNC || process.env.NODE_ENV === "development") {
     sequelize.sync().then(async () => {
         await createCompoundIndexes(compoundIndexCommands);
@@ -181,6 +184,7 @@ if (process.env.FORCE_DB_SYNC || process.env.NODE_ENV === "development") {
 else if (process.env.FORCE_DB_INDEX_SYNC) {
     createCompoundIndexes(compoundIndexCommands);
 }
+// Expose
 db.sequelize = sequelize;
 db.Sequelize = Sequelize;
 module.exports = db;

package/models/index.d.cts

@@ -1,2 +1,46 @@
+import type { Sequelize as SequelizeBaseType, Model, ModelStatic } from "sequelize";
+type ModelInstance<T extends object> = Model<T, Partial<T>> & T;
+type AudioInstance = ModelInstance<YpAudioData>;
+type CategoryInstance = ModelInstance<YpCategoryData>;
+type CommunityInstance = ModelInstance<YpCommunityData>;
+type DomainInstance = ModelInstance<YpDomainData>;
+type EndorsementInstance = ModelInstance<YpEndorsement>;
+type GroupInstance = ModelInstance<YpGroupData>;
+type ImageInstance = ModelInstance<YpImageData>;
+type PageInstance = ModelInstance<YpHelpPageData>;
+type PointInstance = ModelInstance<YpPointData>;
+type PointQualityInstance = ModelInstance<YpPointQuality>;
+type PointRevisionInstance = ModelInstance<YpPointRevision>;
+type PostInstance = ModelInstance<YpPostData>;
+type PostStatusChangeInstance = ModelInstance<YpPostStatusChange>;
+type OrganizationInstance = ModelInstance<YpOrganizationData>;
+type RatingInstance = ModelInstance<YpRatingData>;
+type UserInstance = ModelInstance<YpUserData>;
+type VideoInstance = ModelInstance<YpVideoData>;
+type AcActivityInstance = ModelInstance<AcActivityData>;
+type AcNotificationInstance = ModelInstance<AcNotificationData>;
+interface DeclaredYpModels {
+    sequelize: SequelizeBaseType;
+    Sequelize: typeof SequelizeBaseType;
+    Audio: ModelStatic<AudioInstance>;
+    Category: ModelStatic<CategoryInstance>;
+    Community: ModelStatic<CommunityInstance>;
+    Domain: ModelStatic<DomainInstance>;
+    Endorsement: ModelStatic<EndorsementInstance>;
+    Group: ModelStatic<GroupInstance>;
+    Image: ModelStatic<ImageInstance>;
+    Page: ModelStatic<PageInstance>;
+    Point: ModelStatic<PointInstance>;
+    PointQuality: ModelStatic<PointQualityInstance>;
+    PointRevision: ModelStatic<PointRevisionInstance>;
+    Post: ModelStatic<PostInstance>;
+    PostStatusChange: ModelStatic<PostStatusChangeInstance>;
+    Organization: ModelStatic<OrganizationInstance>;
+    Rating: ModelStatic<RatingInstance>;
+    User: ModelStatic<UserInstance>;
+    Video: ModelStatic<VideoInstance>;
+    AcActivity: ModelStatic<AcActivityInstance>;
+    AcNotification: ModelStatic<AcNotificationInstance>;
+}
+declare const db: DeclaredYpModels;
 export = db;
-declare const db: typeof import("models/index.cjs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.114",
+  "version": "9.0.116",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {
@@ -134,7 +134,8 @@
   },
   "scripts": {
     "copyInLocalAgents": "cp -R ../../policy-synth/agents/ts-out/* ./node_modules/@policysynth/agents/;cp ../../policy-synth/agents/src/*.d.ts ./node_modules/@policysynth/agents/;",
-    "publish_live": "npm run build:dev;copyfiles './src/utils/**/*.d.ts' './src/controllers/**/*.d.ts' './src/agents/**/*.d.ts' './src/models/**/*.d.ts' './src/services/controllers/**/*.d.ts' './src/services/models/**/*.d.ts' 'ts-out/';npm pack && node repack && node publish.js https://registry.npmjs.org/",
+    "publish_live_with_copy": "npm run build:dev;copyfiles './src/utils/**/*.d.ts' './src/controllers/**/*.d.ts' './src/agents/**/*.d.ts' './src/models/**/*.d.ts' './src/services/controllers/**/*.d.ts' './src/services/models/**/*.d.ts' 'ts-out/';npm pack && node repack && node publish.js https://registry.npmjs.org/",
+    "publish_live": "npm run build:dev;npm pack && node repack && node publish.js https://registry.npmjs.org/",
     "publish_local": "npm run build;npm pack && node repack && node publish.js http://localhost:4873",
     "start": "nodemon -e ts ts-out/server.js",
     "watch-start": "DEBUG=router:* tsc --project ./src --outDir ./ts-out -w & nodemon -q ./ts-out/server.js",

package/services/engine/analytics/statsCalc.d.cts

@@ -1,17 +1,17 @@
 export function getPointDomainIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostData, Partial<YpPostData>> & YpPostData>;
     required: boolean;
     attributes: never[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
         required: boolean;
         attributes: never[];
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
             required: boolean;
             attributes: never[];
             include: {
-                model: any;
+                model: import("sequelize").ModelStatic<import("sequelize").Model<YpDomainData, Partial<YpDomainData>> & YpDomainData>;
                 where: {
                     id: any;
                 };
@@ -22,15 +22,15 @@ export function getPointDomainIncludes(id: any): {
     }[];
 }[];
 export function getDomainIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: never[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
         required: boolean;
         attributes: never[];
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpDomainData, Partial<YpDomainData>> & YpDomainData>;
             where: {
                 id: any;
             };
@@ -40,15 +40,15 @@ export function getDomainIncludes(id: any): {
     }[];
 }[];
 export function getPointCommunityIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostData, Partial<YpPostData>> & YpPostData>;
     required: boolean;
     attributes: never[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
         required: boolean;
         attributes: never[];
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
             where: {
                 id: any;
             };
@@ -58,11 +58,11 @@ export function getPointCommunityIncludes(id: any): {
     }[];
 }[];
 export function getCommunityIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: never[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
         where: {
             id: any;
         };
@@ -71,11 +71,11 @@ export function getCommunityIncludes(id: any): {
     }[];
 }[];
 export function getPointGroupIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostData, Partial<YpPostData>> & YpPostData>;
     required: boolean;
     attributes: never[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
         required: boolean;
         where: {
             id: any;
@@ -84,7 +84,7 @@ export function getPointGroupIncludes(id: any): {
     }[];
 }[];
 export function getGroupIncludes(id: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     where: {
         id: any;

package/services/engine/moderation/get_moderation_items.d.cts

@@ -1,13 +1,13 @@
 export function domainIncludes(domainId: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: string[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
         required: boolean;
         attributes: string[];
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpDomainData, Partial<YpDomainData>> & YpDomainData>;
             attributes: string[];
             where: {
                 id: any;
@@ -17,11 +17,11 @@ export function domainIncludes(domainId: any): {
     }[];
 }[];
 export function communityIncludes(communityId: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: string[];
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
         required: boolean;
         attributes: string[];
         where: {
@@ -30,7 +30,7 @@ export function communityIncludes(communityId: any): {
     }[];
 }[];
 export function groupIncludes(groupId: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: string[];
     where: {
@@ -38,7 +38,7 @@ export function groupIncludes(groupId: any): {
     };
 }[];
 export function userIncludes(userId: any): {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpUserData, Partial<YpUserData>> & YpUserData>;
     attributes: any;
     required: boolean;
     where: {

package/services/engine/news_feeds/news_feeds_utils.d.cts

@@ -1,11 +1,22 @@
 export function activitiesDefaultIncludes(options: any): ({
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpUserData, Partial<YpUserData>> & YpUserData>;
     required: boolean;
     attributes: any;
+    include: {
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpImageData, Partial<YpImageData>> & YpImageData>;
+        as: string;
+        attributes: any;
+        required: boolean;
+    }[];
     where?: undefined;
+} | {
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpDomainData, Partial<YpDomainData>> & YpDomainData>;
+    required: boolean;
+    attributes: any;
     include?: undefined;
+    where?: undefined;
 } | {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
     required: boolean;
     attributes: any;
     where: {
@@ -14,7 +25,13 @@ export function activitiesDefaultIncludes(options: any): ({
     };
     include?: undefined;
 } | {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpCommunityData, Partial<YpCommunityData>> & YpCommunityData>;
+    attributes: any;
+    required: boolean;
+    include?: undefined;
+    where?: undefined;
+} | {
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
     required: boolean;
     attributes: any;
     where: {
@@ -24,32 +41,55 @@ export function activitiesDefaultIncludes(options: any): ({
         access?: undefined;
     };
     include: {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpImageData, Partial<YpImageData>> & YpImageData>;
         as: string;
         attributes: any;
         required: boolean;
     }[];
 } | {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
+    required: boolean;
+    attributes: any;
+    include: {
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpImageData, Partial<YpImageData>> & YpImageData>;
+        as: string;
+        attributes: any;
+        required: boolean;
+    }[];
+    where?: undefined;
+} | {
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostData, Partial<YpPostData>> & YpPostData>;
     required: boolean;
     attributes: any;
     include: ({
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpGroupData, Partial<YpGroupData>> & YpGroupData>;
         required: boolean;
         attributes: string[];
         as?: undefined;
         include?: undefined;
     } | {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpUserData, Partial<YpUserData>> & YpUserData>;
+        attributes: string[];
+        required: boolean;
+        as?: undefined;
+        include?: undefined;
+    } | {
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpImageData, Partial<YpImageData>> & YpImageData>;
         as: string;
         attributes: any;
         required: boolean;
         include?: undefined;
     } | {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpAudioData, Partial<YpAudioData>> & YpAudioData>;
+        required: boolean;
+        attributes: string[];
+        as: string;
+        include?: undefined;
+    } | {
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpCategoryData, Partial<YpCategoryData>> & YpCategoryData>;
         required: boolean;
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpImageData, Partial<YpImageData>> & YpImageData>;
             attributes: any;
             required: boolean;
             as: string;
@@ -59,33 +99,45 @@ export function activitiesDefaultIncludes(options: any): ({
     })[];
     where?: undefined;
 } | {
-    model: any;
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPointData, Partial<YpPointData>> & YpPointData>;
     required: boolean;
     attributes: any[];
     include: ({
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpPointRevision, Partial<YpPointRevision>> & YpPointRevision>;
         attributes: any;
         include: {
-            model: any;
+            model: import("sequelize").ModelStatic<import("sequelize").Model<YpUserData, Partial<YpUserData>> & YpUserData>;
             attributes: any;
             required: boolean;
         }[];
         required: boolean;
         as?: undefined;
     } | {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpAudioData, Partial<YpAudioData>> & YpAudioData>;
         required: boolean;
         attributes: string[];
         as: string;
         include?: undefined;
     } | {
-        model: any;
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostData, Partial<YpPostData>> & YpPostData>;
+        attributes: string[];
+        required: boolean;
+        include?: undefined;
+        as?: undefined;
+    } | {
+        model: import("sequelize").ModelStatic<import("sequelize").Model<YpUserData, Partial<YpUserData>> & YpUserData>;
         attributes: string[];
         required: boolean;
         include?: undefined;
         as?: undefined;
     })[];
     where?: undefined;
+} | {
+    model: import("sequelize").ModelStatic<import("sequelize").Model<YpPostStatusChange, Partial<YpPostStatusChange>> & YpPostStatusChange>;
+    attributes: any;
+    required: boolean;
+    include?: undefined;
+    where?: undefined;
 })[];
 export function getCommonWhereOptions(options: any): {
     status: string;