Optimize object

feature/number.js

@@ -1,11 +1,13 @@
-import { lookup, next, err } from "../src/parse.js"
+import { lookup, next, skip, err, cur, idx } from "../src/parse.js"
 import { PERIOD, _0, _E, _e, _9 } from "../src/const.js"
 
 // parse number
-const num = a => a ? err() : [, (a = +next(c => c === PERIOD || (c >= _0 && c <= _9) || (c === _E || c === _e ? 2 : 0))) != a ? err() : a]
+const num = (a, _) => [, (
+  a = +next(c => (c === PERIOD) || (c >= _0 && c <= _9) || (c === _E || c === _e ? 2 : 0))
+) != a ? err() : a]
 
 // .1
-lookup[PERIOD] = a => (!a && num())
+lookup[PERIOD] = a => !a && num()
 
 // 0-9
-for (let i = _0; i <= _9; i++) lookup[i] = num
+for (let i = _0; i <= _9; i++) lookup[i] = a => a ? err() : num()

feature/object.js

@@ -6,11 +6,16 @@ import { PREC_ASSIGN, PREC_SEQ, PREC_TOKEN } from '../src/const.js'
 // {a:1, b:2, c:3}
 group('{}', PREC_TOKEN)
 operator('{}', (a, b) => (
-  !a ? () => ({}) : // {}
-    a[0] === ',' ? (a = a.slice(1).map(compile), ctx => Object.fromEntries(a.map(a => a(ctx)))) : // {a:1,b:2}
-      a[0] === ':' ? (a = compile(a), ctx => Object.fromEntries([a(ctx)])) : // {a:1}
-        (b = compile(a), ctx => ({ [a]: b(ctx) }))
+  // {}
+  !a ? () => ({}) :
+    // {a:1, b}
+    a[0] === ',' ? (
+      a = a.slice(1).map(p => compile(p[0] === ':' ? p : [':', p, p])), ctx => Object.fromEntries(a.map(a => a(ctx)))
+    ) :
+      // {a:1}, {a}
+      (a = compile(a[0] === ':' ? a : [':', a, a]), ctx => Object.fromEntries([a(ctx)]))
 ))
 
 binary(':', PREC_ASSIGN, true)
-operator(':', (a, b) => (b = compile(b), a = Array.isArray(a) ? compile(a) : (a => a).bind(0, a), ctx => [a(ctx), b(ctx)]))
+// "a": a, a: a
+operator(':', (a, b) => (b = compile(b), Array.isArray(a) ? (a = compile(a), ctx => [a(ctx), b(ctx)]) : ctx => [a, b(ctx)]))

test/justin.js

@@ -76,7 +76,7 @@ test('Arrays', () => {
   is(script('[a]')({ a: 1 }), [1])
 })
 
-test('Ops', function(qunit) {
+test('Ops', function (qunit) {
   is(script('1')(), 1)
   is(script('1+2')(), 3)
   is(script('1*2')(), 2)
@@ -198,7 +198,3 @@ test('comment case', () => {
   const expr = 'a // skip all this'
   is(script(expr)({ a: 'a' }), 'a')
 })
-
-test('spread', () => {
-  is(script('{...a, y:2}')({ a: { x: 1 } }), { x: 1, y: 2 })
-})

test/subscript.js

@@ -129,9 +129,14 @@ test('readme', t => {
   is(subscript('true === false')(), false) // false
 })
 
-
-test('ext: interpolate string', t => {
-  is(subscript('a+1')({ a: 1 }), 2)
+test('numbers', t => {
+  is(subscript('1')(), 1)
+  is(subscript('42')(), 42)
+  is(subscript('3.14')(), 3.14)
+  is(subscript('.1')(), .1)
+  is(subscript('0.1')(), 0.1)
+  is(subscript('0.1E+3')(), 0.1E+3)
+  is(subscript('1E-3')(), 1E-3)
 })
 
 test('strings', t => {
@@ -388,7 +393,7 @@ test.skip('ext: ternary', t => {
   sameAsJs('a? b?c:d :e', { a: 0, c: 0, d: 1, e: 2 })
 })
 
-test('ext: object', async t => {
+test('object', async t => {
   await import('../feature/object.js')
   await import('../feature/ternary.js')
 
@@ -399,6 +404,8 @@ test('ext: object', async t => {
   sameAsJs('{x: 1+2, y:a(3)}', { a: x => x * 2 })
   sameAsJs('{1: 2}')
   sameAsJs('{x}', { x: 1 })
+  sameAsJs('{x, y}', { x: 1, y: 2 })
+  // sameAsJs('{...x}', { x: 1 })
 
   sameAsJs('{a:b?c:d}', { b: 2, c: 3, d: 4 })
   sameAsJs('{a:b?c:d, e:!f?g:h}', { b: 2, c: 3, d: 4, f: 1, g: 2, h: 3 })