@chromahq/core 0.1.8 → 0.1.9

package/dist/index.cjs.js

@@ -1073,7 +1073,21 @@ function getNextCronDate(expr) {
   }
 }
 
-class Scheduler {
+function Injectable() {
+  return function(constructor) {
+    L$1()(constructor);
+  };
+}
+
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (decorator(result)) || result;
+  return result;
+};
+let Scheduler = class {
   constructor() {
     this.registry = JobRegistry.instance;
     this.alarm = new AlarmAdapter();
@@ -1126,7 +1140,9 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle.call(job, context);
+      const jobInstance = container.get(id);
+      console.log(jobInstance);
+      await jobInstance.handle.bind(jobInstance).call(jobInstance, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1159,7 +1175,10 @@ class Scheduler {
     const jobs = [];
     return jobs;
   }
-}
+};
+Scheduler = __decorateClass([
+  Injectable()
+], Scheduler);
 
 class ApplicationBootstrap {
   constructor() {
@@ -1216,6 +1235,7 @@ class ApplicationBootstrap {
    */
   async bootServices() {
     this.logger.info("\u{1F680} Booting services...");
+    console.log("services", this.serviceRegistry.entries());
     for (const [serviceName, ServiceClass] of this.serviceRegistry.entries()) {
       try {
         const instance = container.get(ServiceClass);
@@ -1275,7 +1295,7 @@ class ApplicationBootstrap {
           const diKey = `CentralStore:${store.name}`;
           container.bind(diKey).toConstantValue(storeInstance);
           if (isFirstStore) {
-            container.bind("CentralStore").toConstantValue(storeInstance);
+            container.bind("appStore").toConstantValue(storeInstance);
             isFirstStore = false;
           }
           this.registerMessageClass(classes.GetStoreStateMessage, `store:${store.name}:getState`);
@@ -1318,13 +1338,11 @@ class ApplicationBootstrap {
       const paramName = param.toLowerCase();
       if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "appstore" && container.isBound("CentralStore")) {
-          storeInstance = container.get("CentralStore");
-          if (!storeInstance) {
-            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
-          }
-          Reflect.defineMetadata("name", param, storeInstance);
+        storeInstance = container.get("appStore");
+        if (!storeInstance) {
+          throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
         }
+        dependencies.push("appStore");
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1448,9 +1466,6 @@ class ApplicationBootstrap {
       serviceMetadata.dependencies.forEach((dependency, index) => {
         b(_$1(dependency), ServiceClass, index);
       });
-      if (container.isBound("CentralStore")) {
-        b(_$1("CentralStore"), ServiceClass, serviceMetadata.dependencies.length);
-      }
       container.bind(ServiceClass).toSelf().inSingletonScope();
       serviceMetadata.registered = true;
       this.logger.success(`\u2705 Registered service: ${ServiceClass.name}`);
@@ -1512,9 +1527,6 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), MessageClass, index);
         });
-        if (container.isBound("CentralStore")) {
-          b(_$1("CentralStore"), MessageClass, dependencies.length);
-        }
         const messageMetadata = Reflect.getMetadata("name", MessageClass);
         const messageName = messageMetadata || MessageClass.name;
         container.bind(messageName).to(MessageClass).inSingletonScope();
@@ -1575,13 +1587,11 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), JobClass, index);
         });
-        if (container.isBound("CentralStore")) {
-          b(_$1("CentralStore"), JobClass, dependencies.length);
-        }
         const jobMetadata = Reflect.getMetadata("name", JobClass);
         const jobName = jobMetadata || JobClass.name;
         container.bind(JobClass).toSelf().inSingletonScope();
         const id = `${jobName.toLowerCase()}:${JobClass.name.toLowerCase()} ${Math.random().toString(36).substring(2, 15)}`;
+        container.bind(id).to(JobClass).inSingletonScope();
         const options = Reflect.getMetadata("job:options", JobClass) || {};
         const instance = container.get(JobClass);
         JobRegistry.instance.register(id, instance, options);
@@ -1670,12 +1680,6 @@ function Message(name) {
   };
 }
 
-function Injectable() {
-  return function(constructor) {
-    L$1()(constructor);
-  };
-}
-
 class Booteable {
   /**
    * Optional destroy method to be called when the service is being destroyed.

package/dist/index.es.js

@@ -1071,7 +1071,21 @@ function getNextCronDate(expr) {
   }
 }
 
-class Scheduler {
+function Injectable() {
+  return function(constructor) {
+    L$1()(constructor);
+  };
+}
+
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (decorator(result)) || result;
+  return result;
+};
+let Scheduler = class {
   constructor() {
     this.registry = JobRegistry.instance;
     this.alarm = new AlarmAdapter();
@@ -1124,7 +1138,9 @@ class Scheduler {
     try {
       this.registry.updateState(id, JobState.RUNNING);
       console.log(`Executing job ${id}`);
-      await job.handle.call(job, context);
+      const jobInstance = container.get(id);
+      console.log(jobInstance);
+      await jobInstance.handle.bind(jobInstance).call(jobInstance, context);
       if (!context.isStopped() && !context.isPaused()) {
         this.registry.updateState(id, JobState.COMPLETED);
         const options = this.registry.meta(id);
@@ -1157,7 +1173,10 @@ class Scheduler {
     const jobs = [];
     return jobs;
   }
-}
+};
+Scheduler = __decorateClass([
+  Injectable()
+], Scheduler);
 
 class ApplicationBootstrap {
   constructor() {
@@ -1214,6 +1233,7 @@ class ApplicationBootstrap {
    */
   async bootServices() {
     this.logger.info("\u{1F680} Booting services...");
+    console.log("services", this.serviceRegistry.entries());
     for (const [serviceName, ServiceClass] of this.serviceRegistry.entries()) {
       try {
         const instance = container.get(ServiceClass);
@@ -1273,7 +1293,7 @@ class ApplicationBootstrap {
           const diKey = `CentralStore:${store.name}`;
           container.bind(diKey).toConstantValue(storeInstance);
           if (isFirstStore) {
-            container.bind("CentralStore").toConstantValue(storeInstance);
+            container.bind("appStore").toConstantValue(storeInstance);
             isFirstStore = false;
           }
           this.registerMessageClass(classes.GetStoreStateMessage, `store:${store.name}:getState`);
@@ -1316,13 +1336,11 @@ class ApplicationBootstrap {
       const paramName = param.toLowerCase();
       if (paramName === "appstore") {
         let storeInstance;
-        if (paramName === "appstore" && container.isBound("CentralStore")) {
-          storeInstance = container.get("CentralStore");
-          if (!storeInstance) {
-            throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
-          }
-          Reflect.defineMetadata("name", param, storeInstance);
+        storeInstance = container.get("appStore");
+        if (!storeInstance) {
+          throw new Error(`No store found for parameter "${param}" in ${ServiceClass.name}`);
         }
+        dependencies.push("appStore");
         continue;
       }
       const matchingService = Array.from(this.serviceRegistry.entries()).find(
@@ -1446,9 +1464,6 @@ class ApplicationBootstrap {
       serviceMetadata.dependencies.forEach((dependency, index) => {
         b(_$1(dependency), ServiceClass, index);
       });
-      if (container.isBound("CentralStore")) {
-        b(_$1("CentralStore"), ServiceClass, serviceMetadata.dependencies.length);
-      }
       container.bind(ServiceClass).toSelf().inSingletonScope();
       serviceMetadata.registered = true;
       this.logger.success(`\u2705 Registered service: ${ServiceClass.name}`);
@@ -1510,9 +1525,6 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), MessageClass, index);
         });
-        if (container.isBound("CentralStore")) {
-          b(_$1("CentralStore"), MessageClass, dependencies.length);
-        }
         const messageMetadata = Reflect.getMetadata("name", MessageClass);
         const messageName = messageMetadata || MessageClass.name;
         container.bind(messageName).to(MessageClass).inSingletonScope();
@@ -1573,13 +1585,11 @@ class ApplicationBootstrap {
         dependencies.forEach((dependency, index) => {
           b(_$1(dependency), JobClass, index);
         });
-        if (container.isBound("CentralStore")) {
-          b(_$1("CentralStore"), JobClass, dependencies.length);
-        }
         const jobMetadata = Reflect.getMetadata("name", JobClass);
         const jobName = jobMetadata || JobClass.name;
         container.bind(JobClass).toSelf().inSingletonScope();
         const id = `${jobName.toLowerCase()}:${JobClass.name.toLowerCase()} ${Math.random().toString(36).substring(2, 15)}`;
+        container.bind(id).to(JobClass).inSingletonScope();
         const options = Reflect.getMetadata("job:options", JobClass) || {};
         const instance = container.get(JobClass);
         JobRegistry.instance.register(id, instance, options);
@@ -1668,12 +1678,6 @@ function Message(name) {
   };
 }
 
-function Injectable() {
-  return function(constructor) {
-    L$1()(constructor);
-  };
-}
-
 class Booteable {
   /**
    * Optional destroy method to be called when the service is being destroyed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chromahq/core",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Core library for building Chrome extensions with Chroma framework",
   "type": "module",
   "main": "dist/index.cjs.js",