@jdeighan/coffee-utils 8.0.16 → 8.0.17

Sign up to get free protection for your applications and to get access to all the features.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@jdeighan/coffee-utils",
3
3
  "type": "module",
4
- "version": "8.0.16",
4
+ "version": "8.0.17",
5
5
  "description": "A set of utility functions for CoffeeScript",
6
6
  "main": "coffee_utils.js",
7
7
  "exports": {
package/src/arrow.coffee CHANGED
@@ -9,10 +9,12 @@ export hbar = '─' # unicode 2500
9
9
  export corner = '└' # unicode 2514
10
10
  export arrowhead = '>'
11
11
  export space = ' '
12
+ export dot = '.'
12
13
 
13
- export oneIndent = vbar + space + space + space
14
- export arrow = corner + hbar + arrowhead + space
15
- export clearIndent = space + space + space + space
14
+ export oneIndent = vbar + space + space + space
15
+ export arrow = corner + hbar + arrowhead + space
16
+ export clearIndent = space + space + space + space
17
+ export dotIndent = dot + space + space + space
16
18
 
17
19
  # ---------------------------------------------------------------------------
18
20
 
@@ -30,6 +32,12 @@ export prefix = (level, option='none') ->
30
32
  when 'noLast2Vbars'
31
33
  assert (level >= 2), "prefix(), noLast2Vbars but level=#{OL(level)}"
32
34
  return oneIndent.repeat(level-2) + clearIndent + clearIndent
35
+ when 'dotLastVbar'
36
+ assert (level >= 1), "prefix(), dotLastVbar but level=#{OL(level)}"
37
+ return oneIndent.repeat(level-1) + dotIndent
38
+ when 'dotLast2Vbars'
39
+ assert (level >= 2), "prefix(), dotLast2Vbars but level=#{OL(level)}"
40
+ return oneIndent.repeat(level-2) + dotIndent + clearIndent
33
41
  else
34
42
  return oneIndent.repeat(level)
35
43
 
package/src/arrow.js CHANGED
@@ -18,12 +18,16 @@ export var arrowhead = '>';
18
18
 
19
19
  export var space = ' ';
20
20
 
21
+ export var dot = '.';
22
+
21
23
  export var oneIndent = vbar + space + space + space;
22
24
 
23
25
  export var arrow = corner + hbar + arrowhead + space;
24
26
 
25
27
  export var clearIndent = space + space + space + space;
26
28
 
29
+ export var dotIndent = dot + space + space + space;
30
+
27
31
  // ---------------------------------------------------------------------------
28
32
  export var prefix = function(level, option = 'none') {
29
33
  switch (option) {
@@ -40,6 +44,12 @@ export var prefix = function(level, option = 'none') {
40
44
  case 'noLast2Vbars':
41
45
  assert(level >= 2, `prefix(), noLast2Vbars but level=${OL(level)}`);
42
46
  return oneIndent.repeat(level - 2) + clearIndent + clearIndent;
47
+ case 'dotLastVbar':
48
+ assert(level >= 1, `prefix(), dotLastVbar but level=${OL(level)}`);
49
+ return oneIndent.repeat(level - 1) + dotIndent;
50
+ case 'dotLast2Vbars':
51
+ assert(level >= 2, `prefix(), dotLast2Vbars but level=${OL(level)}`);
52
+ return oneIndent.repeat(level - 2) + dotIndent + clearIndent;
43
53
  default:
44
54
  return oneIndent.repeat(level);
45
55
  }
@@ -111,12 +111,8 @@ export doTheLogging = (type, label, lObjects) ->
111
111
 
112
112
  when 'enter'
113
113
  log label, prefix(level)
114
- if label.match(///^ \s* call///)
115
- pre = prefix(level+1, 'noLastVbar')
116
- itemPre = prefix(level+2, 'noLast2Vbars')
117
- else
118
- pre = prefix(level+1)
119
- itemPre = prefix(level+2, 'noLastVbar')
114
+ pre = prefix(level+1, 'dotLastVbar')
115
+ itemPre = prefix(level+2, 'dotLast2Vbars')
120
116
  for obj,i in lObjects
121
117
  logItem "arg[#{i}]", obj, pre, itemPre
122
118
 
@@ -126,6 +122,7 @@ export doTheLogging = (type, label, lObjects) ->
126
122
  itemPre = prefix(level+1, 'noLast2Vbars')
127
123
  for obj,i in lObjects
128
124
  logItem "ret[#{i}]", obj, pre, itemPre
125
+
129
126
  when 'string'
130
127
  pre = prefix(level)
131
128
  itemPre = prefix(level+1, 'noLastVbar')
@@ -151,13 +151,8 @@ export var doTheLogging = function(type, label, lObjects) {
151
151
  switch (type) {
152
152
  case 'enter':
153
153
  log(label, prefix(level));
154
- if (label.match(/^\s*call/)) {
155
- pre = prefix(level + 1, 'noLastVbar');
156
- itemPre = prefix(level + 2, 'noLast2Vbars');
157
- } else {
158
- pre = prefix(level + 1);
159
- itemPre = prefix(level + 2, 'noLastVbar');
160
- }
154
+ pre = prefix(level + 1, 'dotLastVbar');
155
+ itemPre = prefix(level + 2, 'dotLast2Vbars');
161
156
  for (i = j = 0, len = lObjects.length; j < len; i = ++j) {
162
157
  obj = lObjects[i];
163
158
  logItem(`arg[${i}]`, obj, pre, itemPre);