@autometa/app 0.2.4 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @autometa/app
 
+## 0.3.0
+
+### Minor Changes
+
+- 98d911f: feat: replace tsyringe with custom DI solution
+
+### Patch Changes
+
+- Updated dependencies [98d911f]
+  - @autometa/injection@0.1.0
+
 ## 0.2.4
 
 ### Patch Changes

package/dist/esm/index.js

@@ -1,26 +1,10 @@
-var __defProp = Object.defineProperty;
-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 = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
-
 // src/autometa-app.ts
 var AutometaApp = class {
 };
 
 // src/autometa-world.ts
-import { PhraseParser } from "@autometa/phrases";
 var AutometaWorld = class {
 };
-AutometaWorld = __decorateClass([
-  PhraseParser
-], AutometaWorld);
 
 // src/get-app.ts
 import { container } from "tsyringe";
@@ -51,49 +35,19 @@ defineConfig({
   });
   const child = container.createChildContainer();
   const app = ErrorCatcherProxy(child.resolve(appType));
-  app.world = child.resolve(worldType);
   app.id = v4();
   return app;
 }
 
-// src/decorators/fixture.ts
-import "reflect-metadata";
-import {
-  scoped,
-  inject,
-  Lifecycle as LC,
-  injectable,
-  singleton
-} from "tsyringe";
-function Fixture(arg) {
-  if (arg !== void 0 && typeof arg !== "number") {
-    injectable()(arg);
-    scoped(LC.ContainerScoped)(arg);
-    return;
-  }
-  return (target) => {
-    injectable()(target);
-    if (arg === LIFE_CYCLE.Singleton) {
-      singleton()(target);
-      return;
-    }
-    scoped(arg ?? LIFE_CYCLE.ContainerScoped)(target);
-  };
-}
-var Inject = inject;
-var LIFE_CYCLE = {
-  Transient: LC.Transient,
-  Singleton: LC.Singleton,
-  ResolutionScoped: LC.ResolutionScoped,
-  ContainerScoped: LC.ContainerScoped
-};
-
 // src/decorators/app-type.ts
-import { Lifecycle } from "tsyringe";
+import { metadata } from "@autometa/injection";
 function AppType(container2, world, environment = "default") {
   const env = environment ?? "default";
   return (target) => {
-    Fixture(Lifecycle.ContainerScoped)(target);
+    metadata(target.prototype).set({
+      key: "world",
+      class: world
+    });
     container2[env] = { app: target, world };
   };
 }
@@ -101,9 +55,6 @@ export {
   AppType,
   AutometaApp,
   AutometaWorld,
-  Fixture,
-  Inject,
-  LIFE_CYCLE,
   getApp
 };
 //# sourceMappingURL=index.js.map

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/fixture.ts","../../src/decorators/app-type.ts"],"sourcesContent":["import { World } from \"./fixtures.typings\";\n\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World\n}\n","import { PhraseParser } from \"@autometa/phrases\";\n\n@PhraseParser\nexport class AutometaWorld {\n  [key: string]: unknown;\n}\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 \"reflect-metadata\";\n\nimport { Class } from \"@autometa/types\";\nimport {\n  scoped,\n  inject,\n  Lifecycle as LC,\n  injectable,\n  singleton\n} from \"tsyringe\";\n/**\n * Marks a class as an injectable fixture. Constructor parameters\n * which are also injectable will be automatically constructed\n * and passed to the constructor.\n *\n * Example fixtures are the `App` which acts as  shared\n * entry point for all steps in a test, and the World,\n * which stores persistent data across tests.\n *\n * Fixtures are persistent by default, meaning each class\n * will exist as a singleton for the duration of the test\n * ```ts\n * ＠Fixture\n * export class World {\n *  [key: string]: unknown;\n *\n *  declare someExpectedData: MyDataType\n * }\n *\n * ＠Fixture\n * export class MyClient {\n *   constructor(world: MyWorld){}\n *\n *    login = async ()=>{\n *      this.world.someExpectedData = await fetch(...)\n *    }\n * }\n *\n * ＠Fixture\n * export class App {\n *    constructor(\n *      world: MyWorld,\n *      client: MyClient\n *    ){}\n * }\n * ```\n */\nexport function Fixture(target: Class<unknown>): void;\nexport function Fixture<T extends Class<unknown>>(\n  scope?: Lifecycle\n): (target: T) => void;\nexport function Fixture(arg: Lifecycle | undefined | Class<unknown>) {\n  if (arg !== undefined && typeof arg !== \"number\") {\n    injectable()(arg);\n    scoped(LC.ContainerScoped)(arg);\n    return;\n  }\n  return (target: Class<unknown>) => {\n    injectable()(target);\n    if (arg === LIFE_CYCLE.Singleton) {\n      singleton()(target);\n      return;\n    }\n    scoped(arg ?? (LIFE_CYCLE.ContainerScoped as number))(target);\n  };\n}\n\nexport const Inject = inject;\n\nexport const LIFE_CYCLE = {\n  Transient: LC.Transient as 0,\n  Singleton: LC.Singleton as 1,\n  ResolutionScoped: LC.ResolutionScoped as 2,\n  ContainerScoped: LC.ContainerScoped as 3\n} as const;\n\nexport type Lifecycle = (typeof LIFE_CYCLE)[keyof typeof LIFE_CYCLE];\n","import { Class } from \"@autometa/types\";\nimport { Lifecycle } from \"tsyringe\";\nimport { AutometaWorld } from \"..\";\nimport { Fixture } from \"./fixture\";\n\n\nexport function AppType(\n  container: Record<string, { app: unknown; world: unknown; }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    Fixture(Lifecycle.ContainerScoped)(target);\n    container[env] = { app: target, world };\n  };\n}\n"],"mappings":";;;;;;;;;;;;;AAEO,IAAe,cAAf,MAA2B;AAIlC;;;ACNA,SAAS,oBAAoB;AAGtB,IAAM,gBAAN,MAAoB;AAE3B;AAFa,gBAAN;AAAA,EADN;AAAA,GACY;;;ACHb,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;AACpD,MAAI,QAAQ,MAAM,QAAQ,SAAS;AACnC,MAAI,KAAK,GAAG;AACZ,SAAO;AACT;;;ACxCA,OAAO;AAGP;AAAA,EACE;AAAA,EACA;AAAA,EACA,aAAa;AAAA,EACb;AAAA,EACA;AAAA,OACK;AA0CA,SAAS,QAAQ,KAA6C;AACnE,MAAI,QAAQ,UAAa,OAAO,QAAQ,UAAU;AAChD,eAAW,EAAE,GAAG;AAChB,WAAO,GAAG,eAAe,EAAE,GAAG;AAC9B;AAAA,EACF;AACA,SAAO,CAAC,WAA2B;AACjC,eAAW,EAAE,MAAM;AACnB,QAAI,QAAQ,WAAW,WAAW;AAChC,gBAAU,EAAE,MAAM;AAClB;AAAA,IACF;AACA,WAAO,OAAQ,WAAW,eAA0B,EAAE,MAAM;AAAA,EAC9D;AACF;AAEO,IAAM,SAAS;AAEf,IAAM,aAAa;AAAA,EACxB,WAAW,GAAG;AAAA,EACd,WAAW,GAAG;AAAA,EACd,kBAAkB,GAAG;AAAA,EACrB,iBAAiB,GAAG;AACtB;;;ACzEA,SAAS,iBAAiB;AAKnB,SAAS,QACdA,YACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,YAAQ,UAAU,eAAe,EAAE,MAAM;AACzC,IAAAA,WAAU,GAAG,IAAI,EAAE,KAAK,QAAQ,MAAM;AAAA,EACxC;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 { 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"]}

package/dist/index.d.cts

@@ -1,5 +1,5 @@
+import { Container } from '@autometa/injection';
 import { Class } from '@autometa/types';
-import { inject } from 'tsyringe';
 
 /**
  * Basic Key Value store for managing state across Step Definitions. A unique copy of this object
@@ -87,8 +87,8 @@ interface World {
  * ```
  */
 interface App {
-    readonly id: string;
     world: World;
+    di: Container;
 }
 
 declare abstract class AutometaApp {
@@ -98,7 +98,6 @@ declare abstract class AutometaApp {
 }
 
 declare class AutometaWorld {
-    [key: string]: unknown;
 }
 
 declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType: Class<T>, worldType: Class<K>, ...instances: {
@@ -107,57 +106,9 @@ declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType:
     cls?: Class<any>;
 }[]): T;
 
-/**
- * Marks a class as an injectable fixture. Constructor parameters
- * which are also injectable will be automatically constructed
- * and passed to the constructor.
- *
- * Example fixtures are the `App` which acts as  shared
- * entry point for all steps in a test, and the World,
- * which stores persistent data across tests.
- *
- * Fixtures are persistent by default, meaning each class
- * will exist as a singleton for the duration of the test
- * ```ts
- * ＠Fixture
- * export class World {
- *  [key: string]: unknown;
- *
- *  declare someExpectedData: MyDataType
- * }
- *
- * ＠Fixture
- * export class MyClient {
- *   constructor(world: MyWorld){}
- *
- *    login = async ()=>{
- *      this.world.someExpectedData = await fetch(...)
- *    }
- * }
- *
- * ＠Fixture
- * export class App {
- *    constructor(
- *      world: MyWorld,
- *      client: MyClient
- *    ){}
- * }
- * ```
- */
-declare function Fixture(target: Class<unknown>): void;
-declare function Fixture<T extends Class<unknown>>(scope?: Lifecycle): (target: T) => void;
-declare const Inject: typeof inject;
-declare const LIFE_CYCLE: {
-    readonly Transient: 0;
-    readonly Singleton: 1;
-    readonly ResolutionScoped: 2;
-    readonly ContainerScoped: 3;
-};
-type Lifecycle = (typeof LIFE_CYCLE)[keyof typeof LIFE_CYCLE];
-
 declare function AppType(container: Record<string, {
-    app: unknown;
-    world: unknown;
+    app: Class<App>;
+    world: Class<World>;
 }>, world: Class<AutometaWorld>, environment?: string): (target: Class<unknown>) => void;
 
-export { App, AppType, AutometaApp, AutometaWorld, Fixture, Inject, LIFE_CYCLE, Lifecycle, World, getApp };
+export { App, AppType, AutometaApp, AutometaWorld, World, getApp };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
+import { Container } from '@autometa/injection';
 import { Class } from '@autometa/types';
-import { inject } from 'tsyringe';
 
 /**
  * Basic Key Value store for managing state across Step Definitions. A unique copy of this object
@@ -87,8 +87,8 @@ interface World {
  * ```
  */
 interface App {
-    readonly id: string;
     world: World;
+    di: Container;
 }
 
 declare abstract class AutometaApp {
@@ -98,7 +98,6 @@ declare abstract class AutometaApp {
 }
 
 declare class AutometaWorld {
-    [key: string]: unknown;
 }
 
 declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType: Class<T>, worldType: Class<K>, ...instances: {
@@ -107,57 +106,9 @@ declare function getApp<T extends AutometaApp, K extends AutometaWorld>(appType:
     cls?: Class<any>;
 }[]): T;
 
-/**
- * Marks a class as an injectable fixture. Constructor parameters
- * which are also injectable will be automatically constructed
- * and passed to the constructor.
- *
- * Example fixtures are the `App` which acts as  shared
- * entry point for all steps in a test, and the World,
- * which stores persistent data across tests.
- *
- * Fixtures are persistent by default, meaning each class
- * will exist as a singleton for the duration of the test
- * ```ts
- * ＠Fixture
- * export class World {
- *  [key: string]: unknown;
- *
- *  declare someExpectedData: MyDataType
- * }
- *
- * ＠Fixture
- * export class MyClient {
- *   constructor(world: MyWorld){}
- *
- *    login = async ()=>{
- *      this.world.someExpectedData = await fetch(...)
- *    }
- * }
- *
- * ＠Fixture
- * export class App {
- *    constructor(
- *      world: MyWorld,
- *      client: MyClient
- *    ){}
- * }
- * ```
- */
-declare function Fixture(target: Class<unknown>): void;
-declare function Fixture<T extends Class<unknown>>(scope?: Lifecycle): (target: T) => void;
-declare const Inject: typeof inject;
-declare const LIFE_CYCLE: {
-    readonly Transient: 0;
-    readonly Singleton: 1;
-    readonly ResolutionScoped: 2;
-    readonly ContainerScoped: 3;
-};
-type Lifecycle = (typeof LIFE_CYCLE)[keyof typeof LIFE_CYCLE];
-
 declare function AppType(container: Record<string, {
-    app: unknown;
-    world: unknown;
+    app: Class<App>;
+    world: Class<World>;
 }>, world: Class<AutometaWorld>, environment?: string): (target: Class<unknown>) => void;
 
-export { App, AppType, AutometaApp, AutometaWorld, Fixture, Inject, LIFE_CYCLE, Lifecycle, World, getApp };
+export { App, AppType, AutometaApp, AutometaWorld, World, getApp };

package/dist/index.js

@@ -16,15 +16,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
 
 // src/index.ts
 var src_exports = {};
@@ -32,9 +23,6 @@ __export(src_exports, {
   AppType: () => AppType,
   AutometaApp: () => AutometaApp,
   AutometaWorld: () => AutometaWorld,
-  Fixture: () => Fixture,
-  Inject: () => Inject,
-  LIFE_CYCLE: () => LIFE_CYCLE,
   getApp: () => getApp
 });
 module.exports = __toCommonJS(src_exports);
@@ -44,12 +32,8 @@ var AutometaApp = class {
 };
 
 // src/autometa-world.ts
-var import_phrases = require("@autometa/phrases");
 var AutometaWorld = class {
 };
-AutometaWorld = __decorateClass([
-  import_phrases.PhraseParser
-], AutometaWorld);
 
 // src/get-app.ts
 var import_tsyringe = require("tsyringe");
@@ -80,43 +64,19 @@ defineConfig({
   });
   const child = import_tsyringe.container.createChildContainer();
   const app = (0, import_fixture_proxies.ErrorCatcherProxy)(child.resolve(appType));
-  app.world = child.resolve(worldType);
   app.id = (0, import_uuid.v4)();
   return app;
 }
 
-// src/decorators/fixture.ts
-var import_reflect_metadata = require("reflect-metadata");
-var import_tsyringe2 = require("tsyringe");
-function Fixture(arg) {
-  if (arg !== void 0 && typeof arg !== "number") {
-    (0, import_tsyringe2.injectable)()(arg);
-    (0, import_tsyringe2.scoped)(import_tsyringe2.Lifecycle.ContainerScoped)(arg);
-    return;
-  }
-  return (target) => {
-    (0, import_tsyringe2.injectable)()(target);
-    if (arg === LIFE_CYCLE.Singleton) {
-      (0, import_tsyringe2.singleton)()(target);
-      return;
-    }
-    (0, import_tsyringe2.scoped)(arg ?? LIFE_CYCLE.ContainerScoped)(target);
-  };
-}
-var Inject = import_tsyringe2.inject;
-var LIFE_CYCLE = {
-  Transient: import_tsyringe2.Lifecycle.Transient,
-  Singleton: import_tsyringe2.Lifecycle.Singleton,
-  ResolutionScoped: import_tsyringe2.Lifecycle.ResolutionScoped,
-  ContainerScoped: import_tsyringe2.Lifecycle.ContainerScoped
-};
-
 // src/decorators/app-type.ts
-var import_tsyringe3 = require("tsyringe");
+var import_injection = require("@autometa/injection");
 function AppType(container2, world, environment = "default") {
   const env = environment ?? "default";
   return (target) => {
-    Fixture(import_tsyringe3.Lifecycle.ContainerScoped)(target);
+    (0, import_injection.metadata)(target.prototype).set({
+      key: "world",
+      class: world
+    });
     container2[env] = { app: target, world };
   };
 }
@@ -125,9 +85,6 @@ function AppType(container2, world, environment = "default") {
   AppType,
   AutometaApp,
   AutometaWorld,
-  Fixture,
-  Inject,
-  LIFE_CYCLE,
   getApp
 });
 //# sourceMappingURL=index.js.map

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/fixture.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'","import { World } from \"./fixtures.typings\";\n\nexport abstract class AutometaApp {\n  id: string;\n  [key: string]: unknown;\n  world: World\n}\n","import { PhraseParser } from \"@autometa/phrases\";\n\n@PhraseParser\nexport class AutometaWorld {\n  [key: string]: unknown;\n}\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 \"reflect-metadata\";\n\nimport { Class } from \"@autometa/types\";\nimport {\n  scoped,\n  inject,\n  Lifecycle as LC,\n  injectable,\n  singleton\n} from \"tsyringe\";\n/**\n * Marks a class as an injectable fixture. Constructor parameters\n * which are also injectable will be automatically constructed\n * and passed to the constructor.\n *\n * Example fixtures are the `App` which acts as  shared\n * entry point for all steps in a test, and the World,\n * which stores persistent data across tests.\n *\n * Fixtures are persistent by default, meaning each class\n * will exist as a singleton for the duration of the test\n * ```ts\n * ＠Fixture\n * export class World {\n *  [key: string]: unknown;\n *\n *  declare someExpectedData: MyDataType\n * }\n *\n * ＠Fixture\n * export class MyClient {\n *   constructor(world: MyWorld){}\n *\n *    login = async ()=>{\n *      this.world.someExpectedData = await fetch(...)\n *    }\n * }\n *\n * ＠Fixture\n * export class App {\n *    constructor(\n *      world: MyWorld,\n *      client: MyClient\n *    ){}\n * }\n * ```\n */\nexport function Fixture(target: Class<unknown>): void;\nexport function Fixture<T extends Class<unknown>>(\n  scope?: Lifecycle\n): (target: T) => void;\nexport function Fixture(arg: Lifecycle | undefined | Class<unknown>) {\n  if (arg !== undefined && typeof arg !== \"number\") {\n    injectable()(arg);\n    scoped(LC.ContainerScoped)(arg);\n    return;\n  }\n  return (target: Class<unknown>) => {\n    injectable()(target);\n    if (arg === LIFE_CYCLE.Singleton) {\n      singleton()(target);\n      return;\n    }\n    scoped(arg ?? (LIFE_CYCLE.ContainerScoped as number))(target);\n  };\n}\n\nexport const Inject = inject;\n\nexport const LIFE_CYCLE = {\n  Transient: LC.Transient as 0,\n  Singleton: LC.Singleton as 1,\n  ResolutionScoped: LC.ResolutionScoped as 2,\n  ContainerScoped: LC.ContainerScoped as 3\n} as const;\n\nexport type Lifecycle = (typeof LIFE_CYCLE)[keyof typeof LIFE_CYCLE];\n","import { Class } from \"@autometa/types\";\nimport { Lifecycle } from \"tsyringe\";\nimport { AutometaWorld } from \"..\";\nimport { Fixture } from \"./fixture\";\n\n\nexport function AppType(\n  container: Record<string, { app: unknown; world: unknown; }>,\n  world: Class<AutometaWorld>,\n  environment = \"default\"\n) {\n  const env = environment ?? \"default\";\n  return (target: Class<unknown>) => {\n    Fixture(Lifecycle.ContainerScoped)(target);\n    container[env] = { app: target, world };\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACEO,IAAe,cAAf,MAA2B;AAIlC;;;ACNA,qBAA6B;AAGtB,IAAM,gBAAN,MAAoB;AAE3B;AAFa,gBAAN;AAAA,EADN;AAAA,GACY;;;ACHb,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;AACpD,MAAI,QAAQ,MAAM,QAAQ,SAAS;AACnC,MAAI,SAAK,gBAAG;AACZ,SAAO;AACT;;;ACxCA,8BAAO;AAGP,IAAAA,mBAMO;AA0CA,SAAS,QAAQ,KAA6C;AACnE,MAAI,QAAQ,UAAa,OAAO,QAAQ,UAAU;AAChD,qCAAW,EAAE,GAAG;AAChB,iCAAO,iBAAAC,UAAG,eAAe,EAAE,GAAG;AAC9B;AAAA,EACF;AACA,SAAO,CAAC,WAA2B;AACjC,qCAAW,EAAE,MAAM;AACnB,QAAI,QAAQ,WAAW,WAAW;AAChC,sCAAU,EAAE,MAAM;AAClB;AAAA,IACF;AACA,iCAAO,OAAQ,WAAW,eAA0B,EAAE,MAAM;AAAA,EAC9D;AACF;AAEO,IAAM,SAAS;AAEf,IAAM,aAAa;AAAA,EACxB,WAAW,iBAAAA,UAAG;AAAA,EACd,WAAW,iBAAAA,UAAG;AAAA,EACd,kBAAkB,iBAAAA,UAAG;AAAA,EACrB,iBAAiB,iBAAAA,UAAG;AACtB;;;ACzEA,IAAAC,mBAA0B;AAKnB,SAAS,QACdC,YACA,OACA,cAAc,WACd;AACA,QAAM,MAAM,eAAe;AAC3B,SAAO,CAAC,WAA2B;AACjC,YAAQ,2BAAU,eAAe,EAAE,MAAM;AACzC,IAAAA,WAAU,GAAG,IAAI,EAAE,KAAK,QAAQ,MAAM;AAAA,EACxC;AACF;","names":["import_tsyringe","LC","import_tsyringe","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 { 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"]}

package/package.json

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