aontu - npm Package Compare versions

Comparing version 0.3.0 to 0.4.0

dist/lib/lang.js

@@ -112,6 +112,6 @@ "use strict";
         //   let out = orig_bc.call(this, rule, ctx)
-        rs.bc(false, (r, ctx) => {
+        rs.bc((r, ctx) => {
             let valnode = r.node;
             let valtype = typeof valnode;
-            // console.log('VAL RULE', rule.use, rule.node)
+            // console.log('VAL RULE', valtype, r.use, r.node)
             if ('string' === valtype) {
@@ -146,3 +146,3 @@ valnode = addpath(new val_1.StringVal(r.node), r.keep.path);
         //   let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
-        rs.bc(false, (r) => {
+        rs.bc((r) => {
             // console.log('MAP RULE', rule.use, rule.node)
@@ -159,3 +159,3 @@ r.node = addpath(new val_1.MapVal(r.node), r.keep.path);
         //   let out = orig_bc ? orig_bc.call(this, rule, ctx) : undefined
-        rs.bc(false, (r) => {
+        rs.bc((r) => {
             r.node = addpath(new val_1.ListVal(r.node), r.keep.path);
@@ -168,11 +168,5 @@ // return out
     jsonic.rule('pair', (rs) => {
-        // let orig_bc: any = rs.def.bc
         rs
             .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
-            // .bc((...rest: any) => {
-            //   orig_bc(...rest)
-            .bc(false, (rule) => {
-            // let rule = rest[0]
-            // console.log('PAIR RULE', rule.use, rule.node,
-            //  rule.parent.name, rule.parent.use)
+            .bc((rule) => {
             // TRAVERSE PARENTS TO GET PATH
@@ -188,2 +182,16 @@ if (rule.use.spread) {
     });
+    jsonic.rule('elem', (rs) => {
+        rs
+            .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
+            .bc((rule) => {
+            // TRAVERSE PARENTS TO GET PATH
+            if (rule.use.spread) {
+                rule.node[val_1.ListVal.SPREAD] =
+                    (rule.node[val_1.ListVal.SPREAD] || { o: rule.o0.src, v: [] });
+                rule.node[val_1.ListVal.SPREAD].v.push(rule.child.node);
+            }
+            return undefined;
+        });
+        return rs;
+    });
 };
@@ -190,0 +198,0 @@ const includeFileResolver = (0, file_1.makeFileResolver)((spec) => {

lib/lang.ts

@@ -190,3 +190,3 @@ /* Copyright (c) 2021 Richard Rodger, MIT License */
 
-    rs.bc(false, (r: Rule, ctx: Context) => {
+    rs.bc((r: Rule, ctx: Context) => {
 
@@ -196,3 +196,3 @@ let valnode: Val = r.node
 
-      // console.log('VAL RULE', rule.use, rule.node)
+      // console.log('VAL RULE', valtype, r.use, r.node)
 
@@ -237,3 +237,3 @@ if ('string' === valtype) {
 
-    rs.bc(false, (r: Rule) => {
+    rs.bc((r: Rule) => {
 
@@ -256,3 +256,3 @@ // console.log('MAP RULE', rule.use, rule.node)
 
-    rs.bc(false, (r: Rule) => {
+    rs.bc((r: Rule) => {
       r.node = addpath(new ListVal(r.node), r.keep.path)
@@ -270,15 +270,6 @@
   jsonic.rule('pair', (rs: RuleSpec) => {
-    // let orig_bc: any = rs.def.bc
     rs
       .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
 
-      // .bc((...rest: any) => {
-      //   orig_bc(...rest)
-
-
-      .bc(false, (rule: Rule) => {
-        // let rule = rest[0]
-        // console.log('PAIR RULE', rule.use, rule.node,
-        //  rule.parent.name, rule.parent.use)
-
+      .bc((rule: Rule) => {
         // TRAVERSE PARENTS TO GET PATH
@@ -298,2 +289,22 @@
 
+
+  jsonic.rule('elem', (rs: RuleSpec) => {
+    rs
+      .open([{ s: [CJ, CL], p: 'val', u: { spread: true }, g: 'spread' }])
+
+      .bc((rule: Rule) => {
+        // TRAVERSE PARENTS TO GET PATH
+
+        if (rule.use.spread) {
+          rule.node[ListVal.SPREAD] =
+            (rule.node[ListVal.SPREAD] || { o: rule.o0.src, v: [] })
+          rule.node[ListVal.SPREAD].v.push(rule.child.node)
+        }
+
+        return undefined
+      })
+
+    return rs
+  })
+
 }
@@ -300,0 +311,0 @@

package.json

 {
   "name": "aontu",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "main": "dist/aontu.js",
@@ -42,8 +42,8 @@ "type": "commonjs",
   "dependencies": {
-    "@jsonic/directive": "^0.7.0",
-    "@jsonic/expr": "^0.4.1",
-    "@jsonic/jsonic-next": "2.1.0",
-    "@jsonic/multisource": "0.6.0",
-    "@jsonic/path": "^0.1.0",
-    "@types/node": "^18.0.0"
+    "@jsonic/directive": "^0.8.0",
+    "@jsonic/expr": "^0.5.0",
+    "@jsonic/jsonic-next": "^2.3.0",
+    "@jsonic/multisource": "^0.7.0",
+    "@jsonic/path": "^0.2.0",
+    "@types/node": "^18.0.3"
   },
@@ -58,6 +58,6 @@ "devDependencies": {
     "prettier": "^2.7.1",
-    "serve": "^13.0.2",
-    "tinyify": "^3.0.0",
-    "typescript": "^4.7.3"
+    "serve": "^14.0.0",
+    "tinyify": "^3.1.0",
+    "typescript": "^4.7.4"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

131094

increased by0.77%

Lines of code

2858

increased by0.56%

Dependency changes

• + Added@jsonic/directive@0.8.0(transitive)

• + Added@jsonic/expr@0.5.0(transitive)

• + Added@jsonic/jsonic-next@2.14.0(transitive)

• + Added@jsonic/multisource@0.7.0(transitive)

• + Added@jsonic/path@0.2.0(transitive)

• - Removed@jsonic/directive@0.7.0(transitive)

• - Removed@jsonic/expr@0.4.1(transitive)

• - Removed@jsonic/jsonic-next@2.1.0(transitive)

• - Removed@jsonic/multisource@0.6.0(transitive)

• - Removed@jsonic/path@0.1.0(transitive)

• Updated@jsonic/directive@^0.8.0

• Updated@jsonic/expr@^0.5.0

• Updated@jsonic/jsonic-next@^2.3.0

• Updated@jsonic/multisource@^0.7.0

• Updated@jsonic/path@^0.2.0

• Updated@types/node@^18.0.3