@autometa/app 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @autometa/app
 
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies [d563916]
+  - @autometa/injection@0.1.1
+
+## 0.3.1
+
+### Patch Changes
+
+- 6c4bb8d: fix: getApp function not defined
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/esm/index.js

@@ -7,48 +7,24 @@ var AutometaWorld = class {
 };
 
 // src/get-app.ts
-import { container } from "tsyringe";
-import { AutomationError } from "@autometa/errors";
 import { v4 } from "uuid";
-import { ErrorCatcherProxy } from "@autometa/fixture-proxies";
-function getApp(appType, worldType, ...instances) {
-  if (!appType) {
-    throw new AutomationError(`A reference to an 'app' and 'world' is required to run tests.
-
-Configure the app by extending 'AutometaApp' and adding it to your
-'autometa.config.ts' file:
-
-@AppType(MyWorld)
-export class MyAutometaApp extends AutometaApp {
-    ...
-}
-defineConfig({
-   roots: {
-    app: './src/app'
-   }
-})`);
-  }
-  instances.forEach(({ token, instance, cls }) => {
-    const proxiedCls = cls ? ErrorCatcherProxy(cls) : void 0;
-    const proxiedInst = instance ? ErrorCatcherProxy(instance) : void 0;
-    return child.register(token, proxiedInst ?? proxiedCls);
-  });
-  const child = container.createChildContainer();
-  const app = ErrorCatcherProxy(child.resolve(appType));
-  app.id = v4();
-  return app;
+import { Container, defineContainerContext } from "@autometa/injection";
+function getApp(appType, containerName = v4()) {
+  const context = defineContainerContext(containerName);
+  const container = new Container(context);
+  return container.get(appType);
 }
 
 // src/decorators/app-type.ts
 import { metadata } from "@autometa/injection";
-function AppType(container2, world, environment = "default") {
+function AppType(container, world, environment = "default") {
   const env = environment ?? "default";
   return (target) => {
     metadata(target.prototype).set({
       key: "world",
       class: world
     });
-    container2[env] = { app: target, world };
+    container[env] = { app: target, world };
   };
 }
 export {

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/autometa-app.ts","../../src/autometa-world.ts","../../src/get-app.ts","../../src/decorators/app-type.ts"],"sourcesContent":["import { World } from \"./fixtures.typings\";\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World;\n}\n","export class AutometaWorld {}\n","import { container } from \"tsyringe\";\nimport { AutometaApp } from \"./autometa-app\";\nimport { Class } from \"@autometa/types\";\nimport { AutomationError } from \"@autometa/errors\";\nimport { AutometaWorld } from \".\";\nimport { v4 } from \"uuid\";\nimport { ErrorCatcherProxy } from \"@autometa/fixture-proxies\";\nexport function getApp<T extends AutometaApp, K extends AutometaWorld>(\n  appType: Class<T>,\n  worldType: Class<K>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ...instances: { token: any; instance?: any; cls?: Class<any> }[]\n) {\n  if (!appType) {\n    throw new AutomationError(`A reference to an 'app' and 'world' is required to run tests.\n\nConfigure the app by extending 'AutometaApp' and adding it to your\n'autometa.config.ts' file:\n\n@AppType(MyWorld)\nexport class MyAutometaApp extends AutometaApp {\n    ...\n}\ndefineConfig({\n   roots: {\n    app: './src/app'\n   }\n})`);\n  }\n  instances.forEach(({ token, instance, cls }) => {\n    const proxiedCls = cls ? ErrorCatcherProxy(cls) : undefined;\n    const proxiedInst = instance ? ErrorCatcherProxy(instance) : undefined;\n    return child.register(token, proxiedInst ?? proxiedCls);\n  });\n\n  const child = container.createChildContainer();\n  const app = ErrorCatcherProxy(child.resolve(appType));\n  // app.world = child.resolve(worldType);\n  app.id = v4();\n  return app;\n}\n","import { Class } from \"@autometa/types\";\nimport { App, World, AutometaWorld } from \"..\";\nimport { metadata } from \"@autometa/injection\";\nexport function AppType(\n  container: Record<string, { app: Class<App>; world: Class<World> }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    metadata(target.prototype).set({\n      key: \"world\",\n      class: world\n    });\n    container[env] = { app: target as Class<App>, world: world as Class<World> };\n  };\n}\n"],"mappings":";AACO,IAAe,cAAf,MAA2B;AAIlC;;;ACLO,IAAM,gBAAN,MAAoB;AAAC;;;ACA5B,SAAS,iBAAiB;AAG1B,SAAS,uBAAuB;AAEhC,SAAS,UAAU;AACnB,SAAS,yBAAyB;AAC3B,SAAS,OACd,SACA,cAEG,WACH;AACA,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,gBAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAa3B;AAAA,EACD;AACA,YAAU,QAAQ,CAAC,EAAE,OAAO,UAAU,IAAI,MAAM;AAC9C,UAAM,aAAa,MAAM,kBAAkB,GAAG,IAAI;AAClD,UAAM,cAAc,WAAW,kBAAkB,QAAQ,IAAI;AAC7D,WAAO,MAAM,SAAS,OAAO,eAAe,UAAU;AAAA,EACxD,CAAC;AAED,QAAM,QAAQ,UAAU,qBAAqB;AAC7C,QAAM,MAAM,kBAAkB,MAAM,QAAQ,OAAO,CAAC;AAEpD,MAAI,KAAK,GAAG;AACZ,SAAO;AACT;;;ACtCA,SAAS,gBAAgB;AAClB,SAAS,QACdA,YACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,aAAS,OAAO,SAAS,EAAE,IAAI;AAAA,MAC7B,KAAK;AAAA,MACL,OAAO;AAAA,IACT,CAAC;AACD,IAAAA,WAAU,GAAG,IAAI,EAAE,KAAK,QAAsB,MAA6B;AAAA,EAC7E;AACF;","names":["container"]}
+{"version":3,"sources":["../../src/autometa-app.ts","../../src/autometa-world.ts","../../src/get-app.ts","../../src/decorators/app-type.ts"],"sourcesContent":["import { World } from \"./fixtures.typings\";\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World;\n}\n","export class AutometaWorld {}\n","import { AutometaApp } from \"./autometa-app\";\nimport { Class } from \"@autometa/types\";\nimport { v4 } from \"uuid\";\nimport { Container, defineContainerContext } from \"@autometa/injection\";\nimport { App } from \"./fixtures.typings\";\nexport function getApp<T extends AutometaApp>(\n  appType: Class<T>,\n  containerName = v4()\n): App {\n  const context = defineContainerContext(containerName);\n  const container = new Container(context);\n  return container.get(appType);\n}\n","import { Class } from \"@autometa/types\";\nimport { App, World, AutometaWorld } from \"..\";\nimport { metadata } from \"@autometa/injection\";\nexport function AppType(\n  container: Record<string, { app: Class<App>; world: Class<World> }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    metadata(target.prototype).set({\n      key: \"world\",\n      class: world\n    });\n    container[env] = { app: target as Class<App>, world: world as Class<World> };\n  };\n}\n"],"mappings":";AACO,IAAe,cAAf,MAA2B;AAIlC;;;ACLO,IAAM,gBAAN,MAAoB;AAAC;;;ACE5B,SAAS,UAAU;AACnB,SAAS,WAAW,8BAA8B;AAE3C,SAAS,OACd,SACA,gBAAgB,GAAG,GACd;AACL,QAAM,UAAU,uBAAuB,aAAa;AACpD,QAAM,YAAY,IAAI,UAAU,OAAO;AACvC,SAAO,UAAU,IAAI,OAAO;AAC9B;;;ACVA,SAAS,gBAAgB;AAClB,SAAS,QACd,WACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,aAAS,OAAO,SAAS,EAAE,IAAI;AAAA,MAC7B,KAAK;AAAA,MACL,OAAO;AAAA,IACT,CAAC;AACD,cAAU,GAAG,IAAI,EAAE,KAAK,QAAsB,MAA6B;AAAA,EAC7E;AACF;","names":[]}

package/dist/index.d.cts

@@ -100,11 +100,7 @@ declare abstract class AutometaApp {
 declare class AutometaWorld {
 }
 
-declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType: Class<T>, worldType: Class<K>, ...instances: {
-    token: any;
-    instance?: any;
-    cls?: Class<any>;
-}[]): T;
+declare function getApp<T extends AutometaApp>(appType: Class<T>, containerName?: string): App;
 
 declare function AppType(container: Record<string, {
     app: Class<App>;

package/dist/index.d.ts

@@ -100,11 +100,7 @@ declare abstract class AutometaApp {
 declare class AutometaWorld {
 }
 
-declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType: Class<T>, worldType: Class<K>, ...instances: {
-    token: any;
-    instance?: any;
-    cls?: Class<any>;
-}[]): T;
+declare function getApp<T extends AutometaApp>(appType: Class<T>, containerName?: string): App;
 
 declare function AppType(container: Record<string, {
     app: Class<App>;

package/dist/index.js

@@ -36,48 +36,24 @@ var AutometaWorld = class {
 };
 
 // src/get-app.ts
-var import_tsyringe = require("tsyringe");
-var import_errors = require("@autometa/errors");
 var import_uuid = require("uuid");
-var import_fixture_proxies = require("@autometa/fixture-proxies");
-function getApp(appType, worldType, ...instances) {
-  if (!appType) {
-    throw new import_errors.AutomationError(`A reference to an 'app' and 'world' is required to run tests.
-
-Configure the app by extending 'AutometaApp' and adding it to your
-'autometa.config.ts' file:
-
-@AppType(MyWorld)
-export class MyAutometaApp extends AutometaApp {
-    ...
-}
-defineConfig({
-   roots: {
-    app: './src/app'
-   }
-})`);
-  }
-  instances.forEach(({ token, instance, cls }) => {
-    const proxiedCls = cls ? (0, import_fixture_proxies.ErrorCatcherProxy)(cls) : void 0;
-    const proxiedInst = instance ? (0, import_fixture_proxies.ErrorCatcherProxy)(instance) : void 0;
-    return child.register(token, proxiedInst ?? proxiedCls);
-  });
-  const child = import_tsyringe.container.createChildContainer();
-  const app = (0, import_fixture_proxies.ErrorCatcherProxy)(child.resolve(appType));
-  app.id = (0, import_uuid.v4)();
-  return app;
+var import_injection = require("@autometa/injection");
+function getApp(appType, containerName = (0, import_uuid.v4)()) {
+  const context = (0, import_injection.defineContainerContext)(containerName);
+  const container = new import_injection.Container(context);
+  return container.get(appType);
 }
 
 // src/decorators/app-type.ts
-var import_injection = require("@autometa/injection");
-function AppType(container2, world, environment = "default") {
+var import_injection2 = require("@autometa/injection");
+function AppType(container, world, environment = "default") {
   const env = environment ?? "default";
   return (target) => {
-    (0, import_injection.metadata)(target.prototype).set({
+    (0, import_injection2.metadata)(target.prototype).set({
       key: "world",
       class: world
     });
-    container2[env] = { app: target, world };
+    container[env] = { app: target, world };
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/autometa-app.ts","../src/autometa-world.ts","../src/get-app.ts","../src/decorators/app-type.ts"],"sourcesContent":["export * from \"./autometa-app\";\nexport * from \"./autometa-world\";\nexport * from \"./get-app\";\nexport * from \"./decorators\";\nexport * from \"./fixtures.typings\";\n","import { World } from \"./fixtures.typings\";\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World;\n}\n","export class AutometaWorld {}\n","import { container } from \"tsyringe\";\nimport { AutometaApp } from \"./autometa-app\";\nimport { Class } from \"@autometa/types\";\nimport { AutomationError } from \"@autometa/errors\";\nimport { AutometaWorld } from \".\";\nimport { v4 } from \"uuid\";\nimport { ErrorCatcherProxy } from \"@autometa/fixture-proxies\";\nexport function getApp<T extends AutometaApp, K extends AutometaWorld>(\n  appType: Class<T>,\n  worldType: Class<K>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  ...instances: { token: any; instance?: any; cls?: Class<any> }[]\n) {\n  if (!appType) {\n    throw new AutomationError(`A reference to an 'app' and 'world' is required to run tests.\n\nConfigure the app by extending 'AutometaApp' and adding it to your\n'autometa.config.ts' file:\n\n@AppType(MyWorld)\nexport class MyAutometaApp extends AutometaApp {\n    ...\n}\ndefineConfig({\n   roots: {\n    app: './src/app'\n   }\n})`);\n  }\n  instances.forEach(({ token, instance, cls }) => {\n    const proxiedCls = cls ? ErrorCatcherProxy(cls) : undefined;\n    const proxiedInst = instance ? ErrorCatcherProxy(instance) : undefined;\n    return child.register(token, proxiedInst ?? proxiedCls);\n  });\n\n  const child = container.createChildContainer();\n  const app = ErrorCatcherProxy(child.resolve(appType));\n  // app.world = child.resolve(worldType);\n  app.id = v4();\n  return app;\n}\n","import { Class } from \"@autometa/types\";\nimport { App, World, AutometaWorld } from \"..\";\nimport { metadata } from \"@autometa/injection\";\nexport function AppType(\n  container: Record<string, { app: Class<App>; world: Class<World> }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    metadata(target.prototype).set({\n      key: \"world\",\n      class: world\n    });\n    container[env] = { app: target as Class<App>, world: world as Class<World> };\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACCO,IAAe,cAAf,MAA2B;AAIlC;;;ACLO,IAAM,gBAAN,MAAoB;AAAC;;;ACA5B,sBAA0B;AAG1B,oBAAgC;AAEhC,kBAAmB;AACnB,6BAAkC;AAC3B,SAAS,OACd,SACA,cAEG,WACH;AACA,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,8BAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAa3B;AAAA,EACD;AACA,YAAU,QAAQ,CAAC,EAAE,OAAO,UAAU,IAAI,MAAM;AAC9C,UAAM,aAAa,UAAM,0CAAkB,GAAG,IAAI;AAClD,UAAM,cAAc,eAAW,0CAAkB,QAAQ,IAAI;AAC7D,WAAO,MAAM,SAAS,OAAO,eAAe,UAAU;AAAA,EACxD,CAAC;AAED,QAAM,QAAQ,0BAAU,qBAAqB;AAC7C,QAAM,UAAM,0CAAkB,MAAM,QAAQ,OAAO,CAAC;AAEpD,MAAI,SAAK,gBAAG;AACZ,SAAO;AACT;;;ACtCA,uBAAyB;AAClB,SAAS,QACdA,YACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,mCAAS,OAAO,SAAS,EAAE,IAAI;AAAA,MAC7B,KAAK;AAAA,MACL,OAAO;AAAA,IACT,CAAC;AACD,IAAAA,WAAU,GAAG,IAAI,EAAE,KAAK,QAAsB,MAA6B;AAAA,EAC7E;AACF;","names":["container"]}
+{"version":3,"sources":["../src/index.ts","../src/autometa-app.ts","../src/autometa-world.ts","../src/get-app.ts","../src/decorators/app-type.ts"],"sourcesContent":["export * from \"./autometa-app\";\nexport * from \"./autometa-world\";\nexport * from \"./get-app\";\nexport * from \"./decorators\";\nexport * from \"./fixtures.typings\";\n","import { World } from \"./fixtures.typings\";\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World;\n}\n","export class AutometaWorld {}\n","import { AutometaApp } from \"./autometa-app\";\nimport { Class } from \"@autometa/types\";\nimport { v4 } from \"uuid\";\nimport { Container, defineContainerContext } from \"@autometa/injection\";\nimport { App } from \"./fixtures.typings\";\nexport function getApp<T extends AutometaApp>(\n  appType: Class<T>,\n  containerName = v4()\n): App {\n  const context = defineContainerContext(containerName);\n  const container = new Container(context);\n  return container.get(appType);\n}\n","import { Class } from \"@autometa/types\";\nimport { App, World, AutometaWorld } from \"..\";\nimport { metadata } from \"@autometa/injection\";\nexport function AppType(\n  container: Record<string, { app: Class<App>; world: Class<World> }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    metadata(target.prototype).set({\n      key: \"world\",\n      class: world\n    });\n    container[env] = { app: target as Class<App>, world: world as Class<World> };\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACCO,IAAe,cAAf,MAA2B;AAIlC;;;ACLO,IAAM,gBAAN,MAAoB;AAAC;;;ACE5B,kBAAmB;AACnB,uBAAkD;AAE3C,SAAS,OACd,SACA,oBAAgB,gBAAG,GACd;AACL,QAAM,cAAU,yCAAuB,aAAa;AACpD,QAAM,YAAY,IAAI,2BAAU,OAAO;AACvC,SAAO,UAAU,IAAI,OAAO;AAC9B;;;ACVA,IAAAA,oBAAyB;AAClB,SAAS,QACd,WACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,oCAAS,OAAO,SAAS,EAAE,IAAI;AAAA,MAC7B,KAAK;AAAA,MACL,OAAO;AAAA,IACT,CAAC;AACD,cAAU,GAAG,IAAI,EAAE,KAAK,QAAsB,MAA6B;AAAA,EAC7E;AACF;","names":["import_injection"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autometa/app",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "App and World container for Autometa",
   "type": "module",
   "main": "dist/index.js",
@@ -51,7 +51,7 @@
     "@autometa/asserters": "0.1.8",
     "@autometa/errors": "0.2.2",
     "@autometa/fixture-proxies": "^0.1.3",
-    "@autometa/injection": "^0.1.0",
+    "@autometa/injection": "^0.1.1",
     "@autometa/phrases": "0.1.12",
     "tsyringe": "^4.8.0",
     "uuid": "^9.0.1"