mapscreatr - npm Package Compare versions

Comparing version 0.6.3 to 0.6.4

package.json

 {
   "name": "mapscreatr",
   "description": "Storage container and lazy loader for GameStartr maps.",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "author": {
@@ -6,0 +6,0 @@ "name": "Josh Goldberg",

src/IMapsCreatr.ts

@@ -210,10 +210,16 @@ import { IObjectMakr } from "objectmakr/lib/IObjectMakr";
  * 
- * @param scope   The container scope causing the entrance.
  * @param location   The Location within an Area being entered.
  */
 export interface IEntrance {
-    (scope: any, location: ILocation): void;
+    (location: ILocation): void;
 }
 
 /**
+ * Available macros, keyed by name.
+ */
+export interface IMacros {
+    [i: string]: IMacro;
+}
+
+/**
  * A Function to automate placing other PreThings or macros in an Area.
@@ -225,13 +231,6 @@ *
  * @param map   The container Map containing the Area.
- * @param scope   The container scope running the macro.
  * @returns A single PreThing or macro descriptor, or Array thereof.
  */
 export interface IMacro {
-    (
-        reference: any,
-        prethings: IPreThingsContainers,
-        area: IArea | IAreaRaw,
-        map: IMap | IAreaRaw,
-        scope: any
-    ): IPreThing | IPreThing[] | any;
+    (reference: any, prethings: IPreThingsContainers, area: IArea | IAreaRaw, map: IMap | IAreaRaw ): IPreThing | IPreThing[] | any;
 }
@@ -260,8 +259,2 @@
     /**
-     * A scope to give as a last parameter to macro Functions (by default, the
-     * calling MapsCreatr).
-     */
-    scope?: any;
-
-    /**
      * Optional entrance Functions that may be used as the openings for 
@@ -305,7 +298,2 @@ * Locations.
     /**
-     * @returns The scope to give as a last parameter to macros.
-     */
-    getScope(): any;
-
-    /**
      * @returns Whether Locations must have an entrance Function.
@@ -332,9 +320,2 @@ */
     /**
-     * Sets a scope to call macros with, if not this.
-     * 
-     * @param scope   Sets a scope to call macros with, if not this.
-     */
-    setScope(scope?: any): void;
-
-    /**
      * Getter for a map under the maps container. If the map has not yet been
@@ -341,0 +322,0 @@ * initialized that is done here as lazy loading.

src/MapsCreatr.ts

@@ -59,7 +59,2 @@ import { IObjectMakr } from "objectmakr/lib/IObjectMakr";
     /**
-     * An optional scope to call macros with, if not this.
-     */
-    private scope: any;
-
-    /**
      * Initializes a new instance of the MapsCreatr class.
@@ -81,3 +76,2 @@ *
         this.macros = settings.macros || {};
-        this.scope = settings.scope || this;
 
@@ -117,9 +111,2 @@ this.entrances = settings.entrances;
     /**
-     * @returns The scope to give as a last parameter to macros.
-     */
-    public getScope(): any {
-        return this.scope;
-    }
-
-    /**
      * @returns Whether Locations must have an entrance Function.
@@ -159,11 +146,2 @@ */
     /**
-     * Sets a scope to call macros with, if not this.
-     * 
-     * @param scope   Sets a scope to call macros with, if not this.
-     */
-    public setScope(scope?: any): void {
-        this.scope = scope || this;
-    }
-
-    /**
      * Getter for a map under the maps container. If the map has not yet been
@@ -289,3 +267,3 @@ * initialized that is done here as lazy loading.
 
-        const outputs: any = macro.call(this.scope, reference, prethings, area, map);
+        const outputs: any = macro(reference, prethings, area, map);
 
@@ -292,0 +270,0 @@ // If there is any output, recurse on all components of it, Array or not

tslint.json

@@ -49,3 +49,2 @@ {
         "no-switch-case-fall-through": true,
-        "no-trailing-whitespace": true,
         "no-unsafe-finally": true,
@@ -52,0 +51,0 @@ "no-unused-expression": true,

No alert changes

Worsened metrics

Total package byte prevSize

1044458

decreased by-0.11%

Lines of code

5088

decreased by-0.72%

No dependency changes