refactor(geom): swap Group ctor & factory arg order

- first attribs, then children...
thi-ng · Jan 28, 2019 · 6d14f2b · 6d14f2b
1 parent af099ee
commit 6d14f2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/geom/src/api.ts b/packages/geom/src/api.ts
@@ -241,9 +241,9 @@ export class Group implements
     children: IHiccupShape[];
     attribs: Attribs;
 
-    constructor(children: IHiccupShape[], attribs?: Attribs) {
-        this.children = children;
+    constructor(attribs: Attribs, children?: IHiccupShape[]) {
         this.attribs = attribs;
+        this.children = children || [];
     }
 
     get type() {
@@ -256,8 +256,8 @@ export class Group implements
 
     copy() {
         return new Group(
-            <IHiccupShape[]>this.children.map((c) => c.copy()),
-            { ...this.attribs }
+            { ...this.attribs },
+            <IHiccupShape[]>this.children.map((c) => c.copy())
         );
     }
 

diff --git a/packages/geom/src/ctors/group.ts b/packages/geom/src/ctors/group.ts
@@ -2,5 +2,5 @@ import { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 import { Group } from "../api";
 
 export const group =
-    (children: IHiccupShape[], attribs?: Attribs) =>
-        new Group(children, attribs);
+    (attribs: Attribs = {}, children?: IHiccupShape[]) =>
+        new Group(attribs, children);
diff --git a/packages/geom/src/ops/transform.ts b/packages/geom/src/ops/transform.ts
@@ -42,8 +42,8 @@ transform.addAll({
     [Type.GROUP]:
         ($: Group, mat) =>
             new Group(
-                $.children.map((x) => <IHiccupShape>transform(x, mat)),
-                { ...$.attribs }
+                { ...$.attribs },
+                $.children.map((x) => <IHiccupShape>transform(x, mat))
             ),
 
     [Type.LINE]: tx(Line),

diff --git a/packages/geom/src/ops/translate.ts b/packages/geom/src/ops/translate.ts
@@ -72,8 +72,8 @@ translate.addAll({
     [Type.GROUP]:
         ($: Group, delta) =>
             new Group(
-                $.children.map((s) => <IHiccupShape>translate(s, delta)),
-                { ...$.attribs }
+                { ...$.attribs },
+                $.children.map((s) => <IHiccupShape>translate(s, delta))
             ),
 
     [Type.LINE]: tx(Line),