@@ -152,7 +152,7 @@ export function row(...args: OrArrayRest<Piece | undefined> | [{
152
152
return column ( { ...parseArgs ( args ) , axis : Axis . X } ) ;
153
153
}
154
154
155
- export type OutlinePiece = Piece | OutlinePiece [ ] ;
155
+ export type PackPiece = Piece | PackPiece [ ] ;
156
156
157
157
const DEFAULT_PACK_NORMALISE_ITEMS : NormaliseArgs = "default" ;
158
158
@@ -161,7 +161,7 @@ const DEFAULT_PACK_NORMALISE_ITEMS: NormaliseArgs = "default";
161
161
* an array, is first packed in a column, similar to what the `column` function does - and so on,
162
162
* recursively.
163
163
*/
164
- export function pack ( ...piecesRow : OutlinePiece [ ] ) : Piece ;
164
+ export function pack ( ...piecesRow : PackPiece [ ] ) : Piece ;
165
165
/**
166
166
* Packs the piece items in a row (or column, if the Y axis is specified), similar to
167
167
* what the `row` (or `column`) function does. Each item that is an array, is first packed
@@ -171,30 +171,30 @@ export function pack(...piecesRow: OutlinePiece[]): Piece;
171
171
* by default.
172
172
*/
173
173
export function pack ( args : {
174
- pieces : OutlinePiece [ ] ,
174
+ pieces : PackPiece [ ] ,
175
175
axis ?: Axis ,
176
176
normaliseItems ?: NormaliseArgs | "none" ,
177
177
gap ?: number ,
178
178
} ) : Piece ;
179
- export function pack ( ...params : OutlinePiece [ ] | [ {
180
- pieces : OutlinePiece [ ] ,
179
+ export function pack ( ...params : PackPiece [ ] | [ {
180
+ pieces : PackPiece [ ] ,
181
181
axis ?: Axis ,
182
182
normaliseItems ?: NormaliseArgs | "none" ,
183
183
gap ?: number ,
184
184
} ] ) {
185
- function isOutlinePieces ( params : OutlinePiece [ ] | [ { } ] ) : params is OutlinePiece [ ] {
185
+ function isPackPieces ( params : PackPiece [ ] | [ { } ] ) : params is PackPiece [ ] {
186
186
return params . length !== 1 || params [ 0 ] instanceof Piece || Array . isArray ( params [ 0 ] ) ;
187
187
}
188
188
const {
189
189
pieces,
190
190
axis = Axis . X ,
191
191
normaliseItems = DEFAULT_PACK_NORMALISE_ITEMS ,
192
192
gap = 1 ,
193
- } = isOutlinePieces ( params ) ? { pieces : params } : params [ 0 ] ;
193
+ } = isPackPieces ( params ) ? { pieces : params } : params [ 0 ] ;
194
194
function norm ( pc : Piece ) {
195
195
return normaliseItems === "none" ? pc : pc . normalise ( normaliseItems ) ;
196
196
}
197
- function subPack ( pieces : OutlinePiece [ ] , axis : Axis ) : Piece {
197
+ function subPack ( pieces : PackPiece [ ] , axis : Axis ) : Piece {
198
198
return column ( {
199
199
pieces : pieces . map ( o =>
200
200
( o instanceof Piece ? o : subPack ( o , otherAxis ( axis ) ) ) . andThen ( norm ) ) ,
0 commit comments