@etohq/framework 1.3.0 → 1.5.0

package/dist/http/utils/maybe-apply-link-filter.js

@@ -14,23 +14,21 @@ function maybeApplyLinkFilter({ entryPoint, resourceId, filterableField, filterB
             ? filterFields
             : [filterFields];
         delete filterableFields[filterableField];
-        const remoteQuery = (0, context_1.reqContext)(req.requestMeta).scope.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
-        const queryObject = (0, utils_1.remoteQueryObjectFromString)({
-            entryPoint,
-            fields: [resourceId],
-            variables: { filters: { [filterableField]: idsToFilterBy } },
-        });
-        const resources = await remoteQuery(queryObject);
         let existingFilters = filterableFields[filterByField];
+        const requestMeta = req.requestMeta;
+        const query = (0, context_1.reqContext)(requestMeta).scope.resolve(utils_1.ContainerRegistrationKeys.QUERY);
+        const filters = {
+            [filterableField]: idsToFilterBy,
+        };
         if (existingFilters) {
-            if (typeof existingFilters === "string") {
-                existingFilters = [existingFilters];
-            }
-            filterableFields[filterByField] = (0, utils_1.arrayIntersection)(existingFilters, resources.map((p) => p[resourceId]));
-        }
-        else {
-            filterableFields[filterByField] = resources.map((p) => p[resourceId]);
+            filters[resourceId] = existingFilters;
         }
+        const { data: resources } = await query.graph({
+            entity: entryPoint,
+            fields: [resourceId],
+            filters,
+        });
+        filterableFields[filterByField] = resources.map((p) => p[resourceId]);
         req.data.filterableFields = transformFilterableFields(filterableFields);
         return next(req);
     };

package/dist/http/utils/maybe-apply-link-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"maybe-apply-link-filter.js","sourceRoot":"","sources":["../../../src/http/utils/maybe-apply-link-filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"maybe-apply-link-filter.js","sourceRoot":"","sources":["../../../src/http/utils/maybe-apply-link-filter.ts"],"names":[],"mappings":";;AAKA,oDAuDC;AA5DD,wCAAwD;AAExD,2CAA0C;AAG1C,SAAgB,oBAAoB,CAAC,EACnC,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,GAAG,IAAI,GACrB;IACC,OAAO,KAAK,UAAU,UAAU,CAC9B,GAAyB,EACzB,IAAuB;QAEvB,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAA;QAElD,IAAI,CAAC,gBAAgB,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;QAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAA;QAEtD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;YAC/C,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;QAElB,OAAO,gBAAgB,CAAC,eAAe,CAAC,CAAA;QAExC,IAAI,eAAe,GAAG,gBAAgB,CAAC,aAAa,CAGvC,CAAA;QAEb,MAAM,WAAW,GAAG,GAAG,CAAC,WAA0B,CAAA;QAElD,MAAM,KAAK,GAAG,IAAA,oBAAU,EAAC,WAAW,CAAC,CAAC,KAAK,CAAC,OAAO,CACjD,iCAAyB,CAAC,KAAK,CAChC,CAAA;QAED,MAAM,OAAO,GAA4B;YACvC,CAAC,eAAe,CAAC,EAAE,aAAa;SACjC,CAAA;QAED,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,UAAU,CAAC,GAAG,eAAe,CAAA;QACvC,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;YAC5C,MAAM,EAAE,UAAU;YAClB,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,OAAO;SACR,CAAC,CAAA;QAEF,gBAAgB,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;QAErE,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAA;QAEvE,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;IAClB,CAAC,CAAA;AACH,CAAC;AACD;;;;;;;;;;;;;EAaE;AACF,SAAS,yBAAyB,CAAC,gBAAyC;IAC1E,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC3B,IAAI,OAAO,GAAG,MAAM,CAAA;QAEpB,2DAA2D;QAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YACpB,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;YAEpB,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,wCAAwC;gBACxC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;gBACrB,MAAK;YACP,CAAC;YAED,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}

package/dist/http/utils/refetch-entities.d.ts

@@ -1,5 +1,5 @@
 import { EtoContainer } from "@etohq/types";
 import { EtoRequestContext } from "../types";
-export declare const refetchEntities: (entryPoint: string, idOrFilter: string | object, scope: EtoContainer, fields: string[], pagination?: EtoRequestContext["queryConfig"]["pagination"]) => Promise<any>;
+export declare const refetchEntities: (entryPoint: string, idOrFilter: string | object, scope: EtoContainer, fields: string[], pagination?: EtoRequestContext["queryConfig"]["pagination"], withDeleted?: boolean) => Promise<any>;
 export declare const refetchEntity: (entryPoint: string, idOrFilter: string | object, scope: EtoContainer, fields: string[]) => Promise<any>;
 //# sourceMappingURL=refetch-entities.d.ts.map

package/dist/http/utils/refetch-entities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refetch-entities.d.ts","sourceRoot":"","sources":["../../../src/http/utils/refetch-entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAM3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAE5C,eAAO,MAAM,eAAe,GAC1B,YAAY,MAAM,EAClB,YAAY,MAAM,GAAG,MAAM,EAC3B,OAAO,YAAY,EACnB,QAAQ,MAAM,EAAE,EAChB,aAAa,iBAAiB,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,iBAuB5D,CAAA;AAED,eAAO,MAAM,aAAa,GACxB,YAAY,MAAM,EAClB,YAAY,MAAM,GAAG,MAAM,EAC3B,OAAO,YAAY,EACnB,QAAQ,MAAM,EAAE,iBAKjB,CAAA"}
+{"version":3,"file":"refetch-entities.d.ts","sourceRoot":"","sources":["../../../src/http/utils/refetch-entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAM3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAE5C,eAAO,MAAM,eAAe,GAC1B,YAAY,MAAM,EAClB,YAAY,MAAM,GAAG,MAAM,EAC3B,OAAO,YAAY,EACnB,QAAQ,MAAM,EAAE,EAChB,aAAa,iBAAiB,CAAC,aAAa,CAAC,CAAC,YAAY,CAAC,EAC3D,cAAc,OAAO,iBAuBtB,CAAA;AAED,eAAO,MAAM,aAAa,GACxB,YAAY,MAAM,EAClB,YAAY,MAAM,GAAG,MAAM,EAC3B,OAAO,YAAY,EACnB,QAAQ,MAAM,EAAE,iBAKjB,CAAA"}

package/dist/http/utils/refetch-entities.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refetchEntity = exports.refetchEntities = void 0;
 const utils_1 = require("@etohq/utils");
-const refetchEntities = async (entryPoint, idOrFilter, scope, fields, pagination) => {
+const refetchEntities = async (entryPoint, idOrFilter, scope, fields, pagination, withDeleted) => {
     const remoteQuery = scope.resolve(utils_1.ContainerRegistrationKeys.REMOTE_QUERY);
     const filters = (0, utils_1.isString)(idOrFilter) ? { id: idOrFilter } : idOrFilter;
     let context = {};
@@ -12,7 +12,7 @@ const refetchEntities = async (entryPoint, idOrFilter, scope, fields, pagination
         }
         delete filters.context;
     }
-    const variables = { filters, ...context, ...pagination };
+    const variables = { filters, ...context, ...pagination, withDeleted };
     const queryObject = (0, utils_1.remoteQueryObjectFromString)({
         entryPoint,
         variables,

package/dist/http/utils/refetch-entities.js.map

@@ -1 +1 @@
-{"version":3,"file":"refetch-entities.js","sourceRoot":"","sources":["../../../src/http/utils/refetch-entities.ts"],"names":[],"mappings":";;;AACA,wCAIqB;AAGd,MAAM,eAAe,GAAG,KAAK,EAClC,UAAkB,EAClB,UAA2B,EAC3B,KAAmB,EACnB,MAAgB,EAChB,UAA2D,EAC3D,EAAE;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,YAAY,CAAC,CAAA;IACzE,MAAM,OAAO,GAAG,IAAA,gBAAQ,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;IACtE,IAAI,OAAO,GAAW,EAAE,CAAA;IAExB,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,GAAG,OAAO,CAAC,OAAQ,CAAA;QAC5B,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAA;IACxB,CAAC;IAED,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,CAAA;IAExD,MAAM,WAAW,GAAG,IAAA,mCAA2B,EAAC;QAC9C,UAAU;QACV,SAAS;QACT,MAAM;KACP,CAAC,CAAA;IAEF,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,CAAA;AACvC,CAAC,CAAA;AA5BY,QAAA,eAAe,mBA4B3B;AAEM,MAAM,aAAa,GAAG,KAAK,EAChC,UAAkB,EAClB,UAA2B,EAC3B,KAAmB,EACnB,MAAgB,EAChB,EAAE;IACF,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,uBAAe,EAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}
+{"version":3,"file":"refetch-entities.js","sourceRoot":"","sources":["../../../src/http/utils/refetch-entities.ts"],"names":[],"mappings":";;;AACA,wCAIqB;AAGd,MAAM,eAAe,GAAG,KAAK,EAClC,UAAkB,EAClB,UAA2B,EAC3B,KAAmB,EACnB,MAAgB,EAChB,UAA2D,EAC3D,WAAqB,EACrB,EAAE;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,iCAAyB,CAAC,YAAY,CAAC,CAAA;IACzE,MAAM,OAAO,GAAG,IAAA,gBAAQ,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;IACtE,IAAI,OAAO,GAAW,EAAE,CAAA;IAExB,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;QACzB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,GAAG,OAAO,CAAC,OAAQ,CAAA;QAC5B,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAA;IACxB,CAAC;IAED,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,WAAW,EAAE,CAAA;IAErE,MAAM,WAAW,GAAG,IAAA,mCAA2B,EAAC;QAC9C,UAAU;QACV,SAAS;QACT,MAAM;KACP,CAAC,CAAA;IAEF,OAAO,MAAM,WAAW,CAAC,WAAW,CAAC,CAAA;AACvC,CAAC,CAAA;AA7BY,QAAA,eAAe,mBA6B3B;AAEM,MAAM,aAAa,GAAG,KAAK,EAChC,UAAkB,EAClB,UAA2B,EAC3B,KAAmB,EACnB,MAAgB,EAChB,EAAE;IACF,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAA,uBAAe,EAAC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAE7E,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AATY,QAAA,aAAa,iBASzB"}

package/dist/http/utils/validate-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-query.d.ts","sourceRoot":"","sources":["../../../src/http/utils/validate-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAsB,MAAM,cAAc,CAAA;AAS1E,OAAO,EACL,mBAAmB,EAIpB,MAAM,UAAU,CAAA;AAGjB;;;;;GAKG;AAIH,eAAO,MAAM,cAAc,GAAI,OAAO,GAAG,OA6BxC,CAAA;AAwDD,wBAAgB,cAAc,CAAC,OAAO,SAAS,UAAU,EACvD,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,GAChC,mBAAmB,CAwCrB"}
+{"version":3,"file":"validate-query.d.ts","sourceRoot":"","sources":["../../../src/http/utils/validate-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAsB,MAAM,cAAc,CAAA;AAS1E,OAAO,EACL,mBAAmB,EAIpB,MAAM,UAAU,CAAA;AAGjB;;;;;GAKG;AAIH,eAAO,MAAM,cAAc,GAAI,OAAO,GAAG,OA6BxC,CAAA;AAwDD,wBAAgB,cAAc,CAAC,OAAO,SAAS,UAAU,EACvD,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,GAChC,mBAAmB,CAyCrB"}

package/dist/http/utils/validate-query.js

@@ -107,7 +107,8 @@ function transformQuery(queryConfig) {
                     allowed,
                     restricted,
                 });
-            req.data.validatedQuery = validated;
+            const { with_deleted, ...validatedQueryFilters } = validated;
+            req.data.validatedQuery = validatedQueryFilters;
             req.data.filterableFields = getFilterableFields(req.data.validatedQuery);
             req.data.queryConfig = cnf.remoteQueryConfig;
             req.data.listConfig = cnf.listConfig;

package/dist/http/utils/validate-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-query.js","sourceRoot":"","sources":["../../../src/http/utils/validate-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate-query.js","sourceRoot":"","sources":["../../../src/http/utils/validate-query.ts"],"names":[],"mappings":"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"}

package/dist/http/utils/wrap-handler.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=wrap-handler.d.ts.map

package/dist/http/utils/wrap-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap-handler.d.ts","sourceRoot":"","sources":["../../../src/http/utils/wrap-handler.ts"],"names":[],"mappings":""}

package/dist/http/utils/wrap-handler.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// import type {
+//   EtoNextFunction,
+//   EtoRequest,
+//   EtoResponse,
+//   MiddlewareFunction,
+//   RouteHandler,
+// } from "../types"
+//
+// export const wrapHandler = <T extends RouteHandler | MiddlewareFunction>(
+//   fn: T
+// ) => {
+//   async function wrappedHandler(
+//     req: EtoRequest,
+//     res: EtoResponse,
+//     next: EtoNextFunction
+//   ) {
+//     const req_ = req as EtoRequest & { errors?: Error[] }
+//     if (req_?.errors?.length) {
+//       return res.status(400).json({
+//         errors: req_.errors,
+//         message:
+//           "Provided request body contains errors. Please check the data and retry the request",
+//       })
+//     }
+//
+//     try {
+//       return await fn(req, res, next)
+//     } catch (err) {
+//       next(err)
+//     }
+//   }
+//
+//   if (fn.name) {
+//     Object.defineProperty(wrappedHandler, "name", { value: fn.name })
+//   }
+//   return wrappedHandler as T
+// }
+//# sourceMappingURL=wrap-handler.js.map

package/dist/http/utils/wrap-handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap-handler.js","sourceRoot":"","sources":["../../../src/http/utils/wrap-handler.ts"],"names":[],"mappings":";;AAAA,gBAAgB;AAChB,qBAAqB;AACrB,gBAAgB;AAChB,iBAAiB;AACjB,wBAAwB;AACxB,kBAAkB;AAClB,oBAAoB;AACpB,EAAE;AACF,4EAA4E;AAC5E,UAAU;AACV,SAAS;AACT,mCAAmC;AACnC,uBAAuB;AACvB,wBAAwB;AACxB,4BAA4B;AAC5B,QAAQ;AACR,4DAA4D;AAC5D,kCAAkC;AAClC,sCAAsC;AACtC,+BAA+B;AAC/B,mBAAmB;AACnB,kGAAkG;AAClG,WAAW;AACX,QAAQ;AACR,EAAE;AACF,YAAY;AACZ,wCAAwC;AACxC,sBAAsB;AACtB,kBAAkB;AAClB,QAAQ;AACR,MAAM;AACN,EAAE;AACF,mBAAmB;AACnB,wEAAwE;AACxE,MAAM;AACN,+BAA+B;AAC/B,IAAI"}

package/dist/index.d.ts

@@ -7,9 +7,9 @@ export * from "./jobs";
 export * from "./links";
 export * from "./logger";
 export * from "./eto-app-loader";
+export * from "./migrations";
 export * from "./subscribers";
 export * from "./workflows";
-export * from "./telemetry";
 export * from "./zod";
 export * from "./eto";
 export * from "./loader";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,OAAO,CAAA;AACrB,cAAc,OAAO,CAAA;AACrB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,eAAO,MAAM,YAAY,QAAgC,CAAA;AAEzD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA;AAChC,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,OAAO,CAAA;AACrB,cAAc,OAAO,CAAA;AACrB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AAEvB,eAAO,MAAM,YAAY,QAAgC,CAAA;AAEzD,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA"}

package/dist/index.js

@@ -24,9 +24,9 @@ __exportStar(require("./jobs"), exports);
 __exportStar(require("./links"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./eto-app-loader"), exports);
+__exportStar(require("./migrations"), exports);
 __exportStar(require("./subscribers"), exports);
 __exportStar(require("./workflows"), exports);
-__exportStar(require("./telemetry"), exports);
 __exportStar(require("./zod"), exports);
 __exportStar(require("./eto"), exports);
 __exportStar(require("./loader"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,8CAA2B;AAC3B,6CAA0B;AAC1B,kDAA+B;AAC/B,yCAAsB;AACtB,yCAAsB;AACtB,0CAAuB;AACvB,2CAAwB;AACxB,mDAAgC;AAChC,gDAA6B;AAC7B,8CAA2B;AAC3B,8CAA2B;AAC3B,wCAAqB;AACrB,wCAAqB;AACrB,2CAAwB;AACxB,4CAAyB;AACzB,0CAAuB;AAEV,QAAA,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAEzD,kDAA0C;AAAjC,oGAAA,KAAK,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,8CAA2B;AAC3B,6CAA0B;AAC1B,kDAA+B;AAC/B,yCAAsB;AACtB,yCAAsB;AACtB,0CAAuB;AACvB,2CAAwB;AACxB,mDAAgC;AAChC,+CAA4B;AAC5B,gDAA6B;AAC7B,8CAA2B;AAC3B,wCAAqB;AACrB,wCAAqB;AACrB,2CAAwB;AACxB,4CAAyB;AACzB,0CAAuB;AAEV,QAAA,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;AAEzD,kDAA0C;AAAjC,oGAAA,KAAK,OAAA"}

package/dist/jobs/job-loader.d.ts

@@ -1,24 +1,19 @@
 import type { SchedulerOptions } from "@etohq/orchestration";
 import { EtoContainer } from "@etohq/types";
+import { ResourceLoader } from "../utils/resource-loader";
 type CronJobConfig = {
     name: string;
-    schedule: string;
+    schedule: string | SchedulerOptions;
     numberOfExecutions?: SchedulerOptions["numberOfExecutions"];
 };
 type CronJobHandler = (container: EtoContainer) => Promise<any>;
-type LoaderInput = {
-    sourceDir?: string | string[];
-    jobs?: Array<{
-        path: string;
-        module: {
-            default: CronJobHandler;
-            config: CronJobConfig;
-        };
-    }>;
-};
-export declare class JobLoader {
-    #private;
-    constructor({ sourceDir, jobs }: LoaderInput);
+export declare class JobLoader extends ResourceLoader {
+    protected resourceName: string;
+    constructor(sourceDir: string | string[]);
+    protected onFileLoaded(path: string, fileExports: {
+        default: CronJobHandler;
+        config: CronJobConfig;
+    }): Promise<void>;
     /**
      * Validate cron job configuration
      * @param config
@@ -34,11 +29,13 @@ export declare class JobLoader {
      * @param handler
      * @protected
      */
-    protected registerJob({ config, handler, }: {
+    protected register({ config, handler, }: {
         config: CronJobConfig;
         handler: CronJobHandler;
     }): void;
-    private loadFromDirectory;
+    /**
+     * Load cron jobs from one or multiple source paths
+     */
     load(): Promise<void>;
 }
 export {};

package/dist/jobs/job-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-loader.d.ts","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAkB3C,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;CAC5D,CAAA;AAED,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAE/D,KAAK,WAAW,GAAG;IACjB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC7B,IAAI,CAAC,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE;YACN,OAAO,EAAE,cAAc,CAAA;YACvB,MAAM,EAAE,aAAa,CAAA;SACtB,CAAA;KACF,CAAC,CAAA;CACH,CAAA;AAED,qBAAa,SAAS;;gBAmBR,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,WAAW;IAS5C;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE;QAC/B,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAAA;QACnC,IAAI,EAAE,MAAM,CAAA;KACb;IAuBD;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CAAC,EACpB,MAAM,EACN,OAAO,GACR,EAAE;QACD,MAAM,EAAE,aAAa,CAAA;QACrB,OAAO,EAAE,cAAc,CAAA;KACxB;YAiCa,iBAAiB;IAmCzB,IAAI;CAoCX"}
+{"version":3,"file":"job-loader.d.ts","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAQ3C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAAA;IACnC,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;CAC5D,CAAA;AAED,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAE/D,qBAAa,SAAU,SAAQ,cAAc;IAC3C,SAAS,CAAC,YAAY,SAAQ;gBAElB,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;cAIxB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE;QACX,OAAO,EAAE,cAAc,CAAA;QACvB,MAAM,EAAE,aAAa,CAAA;KACtB;IAUH;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE;QAC/B,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAAA;QACnC,IAAI,EAAE,MAAM,CAAA;KACb;IAuBD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,EACjB,MAAM,EACN,OAAO,GACR,EAAE;QACD,MAAM,EAAE,aAAa,CAAA;QACrB,OAAO,EAAE,cAAc,CAAA;KACxB;IAiCD;;OAEG;IACG,IAAI;CAKX"}

package/dist/jobs/job-loader.js

@@ -1,47 +1,22 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _JobLoader_sourceDir, _JobLoader_preLoadedJobs, _JobLoader_excludes;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobLoader = void 0;
 const utils_1 = require("@etohq/utils");
 const workflows_sdk_1 = require("@etohq/workflows-sdk");
-const promises_1 = require("fs/promises");
-const path_1 = require("path");
 const logger_1 = require("../logger");
-class JobLoader {
-    constructor({ sourceDir, jobs }) {
-        /**
-         * The directory from which to load the jobs
-         * @private
-         */
-        _JobLoader_sourceDir.set(this, void 0);
-        _JobLoader_preLoadedJobs.set(this, void 0);
-        /**
-         * The list of file names to exclude from the subscriber scan
-         * @private
-         */
-        _JobLoader_excludes.set(this, [
-            /index\.js/,
-            /index\.ts/,
-            /\.DS_Store/,
-            /(\.ts\.map|\.js\.map|\.d\.ts|\.md)/,
-            /^_[^/\\]*(\.[^/\\]+)?$/,
-        ]);
-        if (!sourceDir && !jobs) {
-            throw new Error('Either sourceDir or jobs must be provided');
-        }
-        __classPrivateFieldSet(this, _JobLoader_sourceDir, sourceDir, "f");
-        __classPrivateFieldSet(this, _JobLoader_preLoadedJobs, jobs, "f");
+const resource_loader_1 = require("../utils/resource-loader");
+class JobLoader extends resource_loader_1.ResourceLoader {
+    constructor(sourceDir) {
+        super(sourceDir);
+        this.resourceName = "job";
+    }
+    async onFileLoaded(path, fileExports) {
+        this.validateConfig(fileExports.config);
+        logger_1.logger.debug(`Registering job from ${path}.`);
+        this.register({
+            config: fileExports.config,
+            handler: fileExports.default,
+        });
     }
     /**
      * Validate cron job configuration
@@ -65,7 +40,7 @@ class JobLoader {
      * @param handler
      * @protected
      */
-    registerJob({ config, handler, }) {
+    register({ config, handler, }) {
         const workflowName = `job-${config.name}`;
         const step = (0, workflows_sdk_1.createStep)(`${config.name}-as-step`, async (_, stepContext) => {
             const { container } = stepContext;
@@ -91,58 +66,13 @@ class JobLoader {
             step();
         });
     }
-    async loadFromDirectory(sourcePath) {
-        try {
-            await (0, promises_1.access)(sourcePath);
-        }
-        catch {
-            logger_1.logger.info(`No job to load from ${sourcePath}. skipped.`);
-            return [];
-        }
-        return await (0, utils_1.readDirRecursive)(sourcePath).then(async (entries) => {
-            const fileEntries = entries.filter((entry) => {
-                return (!entry.isDirectory() &&
-                    !__classPrivateFieldGet(this, _JobLoader_excludes, "f").some((exclude) => exclude.test(entry.name)));
-            });
-            logger_1.logger.debug(`Registering jobs from ${sourcePath}.`);
-            return await (0, utils_1.promiseAll)(fileEntries.map(async (entry) => {
-                const fullPath = (0, path_1.join)(entry.path, entry.name);
-                const module_ = await (0, utils_1.dynamicImport)(fullPath);
-                const input = {
-                    config: module_.config,
-                    handler: module_.default,
-                };
-                this.validateConfig(input.config);
-                return input;
-            }));
-        });
-    }
+    /**
+     * Load cron jobs from one or multiple source paths
+     */
     async load() {
-        const jobInputs = [];
-        // Handle pre-loaded jobs
-        if (__classPrivateFieldGet(this, _JobLoader_preLoadedJobs, "f")) {
-            for (const { module } of __classPrivateFieldGet(this, _JobLoader_preLoadedJobs, "f")) {
-                const input = {
-                    config: module.config,
-                    handler: module.default,
-                };
-                this.validateConfig(input.config);
-                jobInputs.push(input);
-            }
-        }
-        // Handle source directory scanning
-        if (__classPrivateFieldGet(this, _JobLoader_sourceDir, "f")) {
-            const normalizedSourcePath = Array.isArray(__classPrivateFieldGet(this, _JobLoader_sourceDir, "f"))
-                ? __classPrivateFieldGet(this, _JobLoader_sourceDir, "f")
-                : [__classPrivateFieldGet(this, _JobLoader_sourceDir, "f")];
-            const directoryJobs = await (0, utils_1.promiseAll)(normalizedSourcePath.map(path => this.loadFromDirectory(path)));
-            jobInputs.push(...directoryJobs.flat(1).filter(Boolean));
-        }
-        // Register all jobs
-        jobInputs.forEach(input => this.registerJob(input));
+        await super.discoverResources();
         logger_1.logger.debug(`Jobs registered.`);
     }
 }
 exports.JobLoader = JobLoader;
-_JobLoader_sourceDir = new WeakMap(), _JobLoader_preLoadedJobs = new WeakMap(), _JobLoader_excludes = new WeakMap();
 //# sourceMappingURL=job-loader.js.map

package/dist/jobs/job-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-loader.js","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"job-loader.js","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":";;;AAEA,wCAAiD;AACjD,wDAI6B;AAC7B,sCAAkC;AAClC,8DAAyD;AAUzD,MAAa,SAAU,SAAQ,gCAAc;IAG3C,YAAY,SAA4B;QACtC,KAAK,CAAC,SAAS,CAAC,CAAA;QAHR,iBAAY,GAAG,KAAK,CAAA;IAI9B,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,IAAY,EACZ,WAGC;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QACvC,eAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,GAAG,CAAC,CAAA;QAC7C,IAAI,CAAC,QAAQ,CAAC;YACZ,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B,CAAC,CAAA;IACJ,CAAC;IAED;;;;OAIG;IACO,cAAc,CAAC,MAGxB;QACC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,EAC/B,wCAAwC,CACzC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,EAC/B,0DAA0D,CAC3D,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,gBAAQ,CAChB,gBAAQ,CAAC,KAAK,CAAC,gBAAgB,EAC/B,0CAA0C,CAC3C,CAAA;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACO,QAAQ,CAAC,EACjB,MAAM,EACN,OAAO,GAIR;QACC,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;QACzC,MAAM,IAAI,GAAG,IAAA,0BAAU,EACrB,GAAG,MAAM,CAAC,IAAI,UAAU,EACxB,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE;YACvB,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAA;YACjC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;gBACpC,OAAO,IAAI,4BAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,KAAK,CACV,iBAAiB,MAAM,CAAC,IAAI,uBAAuB,KAAK,CAAC,OAAO,EAAE,CACnE,CAAA;gBACD,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,QAAQ,CAAC;gBACjC,CAAC,CAAC,MAAM,CAAC,QAAQ;gBACjB,CAAC,CAAC;oBACE,IAAI,EAAE,MAAM,CAAC,QAAQ;oBACrB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;iBAC9C;SACN,CAAA;QAED,IAAA,8BAAc,EAAC,cAAc,EAAE,GAAG,EAAE;YAClC,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAA;QAE/B,eAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAClC,CAAC;CACF;AA1GD,8BA0GC"}

package/dist/links/link-loader.js

@@ -60,7 +60,7 @@ class LinkLoader {
                 });
                 logger_1.logger.debug(`Registering links from ${sourcePath}.`);
                 return await (0, utils_1.promiseAll)(fileEntries.map(async (entry) => {
-                    const fullPath = (0, path_1.join)(entry.path, entry.name);
+                    const fullPath = (0, path_1.join)(sourcePath, entry.name);
                     return await (0, utils_1.dynamicImport)(fullPath);
                 }));
             });

package/dist/links/link-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"link-loader.js","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA0E;AAE1E,0CAAoC;AACpC,+BAA2B;AAC3B,sCAAkC;AAElC,MAAa,UAAU;IAmBrB,YAAY,SAA4B;QAlBxC;;;WAGG;QACH,wCAA6B;QAE7B;;;WAGG;QACH,+BAAsB;YACpB,WAAW;YACX,WAAW;YACX,YAAY;YACZ,oCAAoC;YACpC,wBAAwB;SACzB,EAAA;QAGC,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAA;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,uBAAA,IAAI,6BAAW,CAAC;YACzD,CAAC,CAAC,uBAAA,IAAI,6BAAW;YACjB,CAAC,CAAC,CAAC,uBAAA,IAAI,6BAAW,CAAC,CAAA;QAErB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC7D,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,UAAU,CAAC,CAAA;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,eAAM,CAAC,IAAI,CAAC,wBAAwB,UAAU,YAAY,CAAC,CAAA;gBAC3D,OAAM;YACR,CAAC;YAED,OAAO,MAAM,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAa,EAAE,EAAE;oBACnD,OAAO,CACL,CAAC,KAAK,CAAC,WAAW,EAAE;wBACpB,CAAC,uBAAA,IAAI,4BAAU,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC5D,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,eAAM,CAAC,KAAK,CAAC,0BAA0B,UAAU,GAAG,CAAC,CAAA;gBAErD,OAAO,MAAM,IAAA,kBAAU,EACrB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE;oBACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC7C,OAAO,MAAM,IAAA,qBAAa,EAAC,QAAQ,CAAC,CAAA;gBACtC,CAAC,CAAC,CACH,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAA;QAE1B,eAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACnC,CAAC;CACF;AA/DD,gCA+DC"}
+{"version":3,"file":"link-loader.js","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA0E;AAE1E,0CAAoC;AACpC,+BAA2B;AAC3B,sCAAkC;AAElC,MAAa,UAAU;IAmBrB,YAAY,SAA4B;QAlBxC;;;WAGG;QACH,wCAA6B;QAE7B;;;WAGG;QACH,+BAAsB;YACpB,WAAW;YACX,WAAW;YACX,YAAY;YACZ,oCAAoC;YACpC,wBAAwB;SACzB,EAAA;QAGC,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAA;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,uBAAA,IAAI,6BAAW,CAAC;YACzD,CAAC,CAAC,uBAAA,IAAI,6BAAW;YACjB,CAAC,CAAC,CAAC,uBAAA,IAAI,6BAAW,CAAC,CAAA;QAErB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC7D,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,UAAU,CAAC,CAAA;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,eAAM,CAAC,IAAI,CAAC,wBAAwB,UAAU,YAAY,CAAC,CAAA;gBAC3D,OAAM;YACR,CAAC;YAED,OAAO,MAAM,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAa,EAAE,EAAE;oBACnD,OAAO,CACL,CAAC,KAAK,CAAC,WAAW,EAAE;wBACpB,CAAC,uBAAA,IAAI,4BAAU,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC5D,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,eAAM,CAAC,KAAK,CAAC,0BAA0B,UAAU,GAAG,CAAC,CAAA;gBAErD,OAAO,MAAM,IAAA,kBAAU,EACrB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE;oBACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC7C,OAAO,MAAM,IAAA,qBAAa,EAAC,QAAQ,CAAC,CAAA;gBACtC,CAAC,CAAC,CACH,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAA;QAE1B,eAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACnC,CAAC;CACF;AA/DD,gCA+DC"}

package/dist/loader.d.ts

@@ -1,24 +1,20 @@
-import { ConfigModule, DefaultModulesDefinition, EtoContainer, FlagSettings, InputConfigModules, ModuleDefinitionsInput } from "@etohq/types";
+import { ConfigModule, EtoContainer, FlagSettings, InputConfig, ModulesDefinitionInput } from "@etohq/types";
 import { Eto } from "./eto";
 /**
  * Initializes the DI container with configurations and feature flags.
  */
-export declare function initializeContainer<TKey extends string = string>(rootDirectory: string, featureFlags: (string | Record<string, FlagSettings>)[], inlineConfig?: ConfigModule, modulesDefinitionResult?: {
-    modulesDefinition: DefaultModulesDefinition<TKey>;
-    modules: InputConfigModules<TKey>;
-}): Promise<EtoContainer>;
+export declare function initializeContainer<TKey extends string = string>(rootDirectory: string, featureFlags: (string | Record<string, FlagSettings>)[], modulesDefinitionInput: ModulesDefinitionInput<TKey>, inputConfig?: InputConfig<TKey>): Promise<{
+    container: EtoContainer;
+    configModule: ConfigModule<TKey>;
+}>;
 /**
  * Main application initialization function.
  */
-export declare function withLoader<TKey extends string = string>({ directory, loaderModules, linkModule, featureFlags, backgroundLoaders, }: {
+export declare function withLoader<TKey extends string = string>({ directory, modulesDefinitionInput, linkModule, featureFlags, backgroundLoaders, }: {
     directory: string;
     linkModule: any;
-    loaderModules: ModuleDefinitionsInput<TKey>;
+    modulesDefinitionInput: ModulesDefinitionInput<TKey>;
     featureFlags: (string | Record<string, FlagSettings>)[];
     backgroundLoaders: (() => Promise<void>)[];
-}): {
-    defaultModules: InputConfigModules<TKey>;
-    modulesDefinition: DefaultModulesDefinition<TKey>;
-    loadEto: (inlineConfig?: ConfigModule<TKey>) => Promise<Eto>;
-};
+}): (inputConfig: InputConfig<TKey>) => Promise<Eto<TKey>>;
 //# sourceMappingURL=loader.d.ts.map

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,EACxB,YAAY,EACZ,YAAY,EACZ,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,cAAc,CAAA;AASrB,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAgD3B;;GAEG;AAKH,wBAAsB,mBAAmB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EACpE,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,EACvD,YAAY,CAAC,EAAE,YAAY,EAC3B,uBAAuB,CAAC,EAAE;IACxB,iBAAiB,EAAE,wBAAwB,CAAC,IAAI,CAAC,CAAA;IACjD,OAAO,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAA;CAClC,GACA,OAAO,CAAC,YAAY,CAAC,CAgBvB;AAED;;GAEG;AAQH,wBAAgB,UAAU,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,EACvD,SAAS,EACT,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,GAAG,CAAA;IACf,aAAa,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAA;IAC3C,YAAY,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,CAAA;IACvD,iBAAiB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;CAC3C;;;6BAQoB,YAAY,CAAC,IAAI,CAAC,KAChC,OAAO,CAAC,GAAG,CAAC;EAmDlB"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,sBAAsB,EACvB,MAAM,cAAc,CAAA;AASrB,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAgD3B;;GAEG;AAKH,wBAAsB,mBAAmB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EACpE,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,EACvD,sBAAsB,EAAE,sBAAsB,CAAC,IAAI,CAAC,EACpD,WAAW,CAAC,EAAG,WAAW,CAAC,IAAI,CAAC,GAC/B,OAAO,CAAC;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAiBxE;AAED;;GAEG;AAQH,wBAAgB,UAAU,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,EACvD,SAAS,EACT,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,GAAG,CAAA;IACf,sBAAsB,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAA;IACpD,YAAY,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,CAAA;IACvD,iBAAiB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;CAC3C,IAIK,aAAa,WAAW,CAAC,IAAI,CAAC,KAC7B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CA8DtB"}

package/dist/loader.js

@@ -48,15 +48,16 @@ async function loadEntrypoints(backgroundLoaders, container) {
  */
 // todo update test for configLooader to accomodate inlineDefaultModules.
 // todo add system default at config level.
-async function initializeContainer(rootDirectory, featureFlags, inlineConfig, modulesDefinitionResult) {
-    await (0, config_1.configLoader)(rootDirectory, "eto-config", inlineConfig, modulesDefinitionResult);
+async function initializeContainer(rootDirectory, featureFlags, modulesDefinitionInput, inputConfig) {
+    const configModule = await (0, config_1.configLoader)(rootDirectory, "eto-config", modulesDefinitionInput, inputConfig);
     await (0, feature_flags_1.featureFlagsLoader)(featureFlags);
     container_1.container.register({
         [utils_1.ContainerRegistrationKeys.LOGGER]: (0, awilix_1.asValue)(logger_1.logger),
         [utils_1.ContainerRegistrationKeys.REMOTE_QUERY]: (0, awilix_1.asValue)(null),
     });
+    console.log("[Eto] - loading database connection");
     (0, database_1.pgConnectionLoader)();
-    return container_1.container;
+    return { container: container_1.container, configModule };
 }
 /**
  * Main application initialization function.
@@ -66,39 +67,43 @@ async function initializeContainer(rootDirectory, featureFlags, inlineConfig, mo
 // import { preLoadedSubscribers } from "../subscribers"
 // const __filename = fileURLToPath(import.meta.url)
 // const dir = process.cwd()
-function withLoader({ directory, loaderModules, linkModule, featureFlags, backgroundLoaders, }) {
-    const modulesDefinitionResult = (0, modules_sdk_1.generateModulesDefinition)(...loaderModules);
-    const { modulesDefinition, modules: defaultModules } = modulesDefinitionResult;
-    return {
-        defaultModules,
-        modulesDefinition,
-        loadEto: async function loader(inlineConfig) {
-            const container = await initializeContainer(directory, featureFlags, inlineConfig, modulesDefinitionResult);
-            const { onApplicationStart, onApplicationShutdown, onApplicationPrepareShutdown, modules, gqlSchema, } = await new eto_app_loader_1.EtoAppLoader({
-                modulesDefinition,
-                linkModule,
-            }).load();
-            const entrypointsShutdown = await loadEntrypoints(backgroundLoaders, container);
+function withLoader({ directory, modulesDefinitionInput, linkModule, featureFlags, backgroundLoaders, }) {
+    return async function loader(inputConfig) {
+        const isExec = (0, utils_1.isExecMode)();
+        const defaultModulesDefinition = (0, modules_sdk_1.generateModulesDefinition)(...modulesDefinitionInput);
+        const { container } = await initializeContainer(directory, featureFlags, modulesDefinitionInput, inputConfig);
+        const { onApplicationStart, onApplicationShutdown, onApplicationPrepareShutdown, modules, gqlSchema, } = await new eto_app_loader_1.EtoAppLoader({
+            modulesDefinition: defaultModulesDefinition,
+            linkModule,
+        }).load();
+        const entrypointsShutdown = await loadEntrypoints(backgroundLoaders, container);
+        // no need too run all start functionns since some requires migrations, which is not garantee to be available when running on exec. todo enable a way to ignore.
+        if (!isExec) {
+            console.log(isExec, "isExec");
             await onApplicationStart();
-            const shutdown = async () => {
-                const pgConnection = container.resolve(utils_1.ContainerRegistrationKeys.PG_CONNECTION);
-                await onApplicationPrepareShutdown();
-                await onApplicationShutdown();
-                await (0, utils_1.promiseAll)([
-                    container.dispose(),
-                    // @ts-ignore
-                    pgConnection?.context?.destroy?.(),
-                    entrypointsShutdown(),
-                ]);
-            };
-            return {
-                container,
-                shutdown,
-                modules,
-                gqlSchema,
-                directory,
-            };
-        },
+        }
+        const shutdown = async () => {
+            const pgConnection = container.resolve(utils_1.ContainerRegistrationKeys.PG_CONNECTION);
+            await onApplicationPrepareShutdown();
+            await onApplicationShutdown();
+            await (0, utils_1.promiseAll)([
+                container.dispose(),
+                // @ts-ignore
+                pgConnection?.context?.destroy?.(),
+                entrypointsShutdown(),
+            ]);
+        };
+        return {
+            container,
+            shutdown,
+            modules,
+            gqlSchema,
+            directory,
+            inputConfig,
+            modulesDefinitionInput,
+            linkModule,
+            isExecMode: isExec,
+        };
     };
 }
 //# sourceMappingURL=loader.js.map

package/dist/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}