@atomist/rug
Advanced tools
Comparing version 0.17.1 to 0.17.2
@@ -17,3 +17,3 @@ "use strict"; | ||
var pathExpression = "/" + type + "()"; | ||
var r = this.pexe.scalarStr(f, pathExpression); | ||
var r = this.pexe.scalar(f, pathExpression); | ||
//console.log(`Reparsed=${r}`) | ||
@@ -20,0 +20,0 @@ return r; |
@@ -20,3 +20,3 @@ import {TreeNode,TextTreeNode,ParentAwareTreeNode,PathExpressionEngine} from "../tree/PathExpression" | ||
let pathExpression = `/${type}()` | ||
let r = this.pexe.scalarStr<File,TextTreeNode>(f, pathExpression) | ||
let r = this.pexe.scalar<File,TextTreeNode>(f, pathExpression) | ||
//console.log(`Reparsed=${r}`) | ||
@@ -23,0 +23,0 @@ return r |
@@ -27,3 +27,3 @@ /** | ||
try { | ||
return this.pexe.scalarStr(this.node, "/pkg/termSelect"); | ||
return this.pexe.scalar(this.node, "/pkg/termSelect"); | ||
} | ||
@@ -30,0 +30,0 @@ catch (e) { |
@@ -26,3 +26,3 @@ | ||
try { | ||
return this.pexe.scalarStr<TextTreeNode,TextTreeNode>(this.node, "/pkg/termSelect") | ||
return this.pexe.scalar<TextTreeNode,TextTreeNode>(this.node, "/pkg/termSelect") | ||
} | ||
@@ -29,0 +29,0 @@ catch (e) { |
@@ -197,2 +197,9 @@ /* | ||
/** | ||
* Makes a file executable | ||
* | ||
* @param path {string} The path to use | ||
*/ | ||
makeExecutable(path: string): void | ||
/** | ||
* Merge the given template to the given output path. | ||
@@ -199,0 +206,0 @@ * |
@@ -172,3 +172,3 @@ import {GraphNode, TreeNode, PathExpressionEngine, PathExpression, Match} from "../tree/PathExpression" | ||
constructor(about: string | Json){ | ||
constructor(about?: string | Json){ | ||
this.body = about; | ||
@@ -201,1 +201,2 @@ } | ||
export {HandleResponse, HandleCommand, HandleEvent} | ||
export {Edit, ProjectInstruction} |
{ | ||
"name": "@atomist/rug", | ||
"version": "0.17.1", | ||
"version": "0.17.2", | ||
"description": "TypeScript model for Atomist editors, generators etc", | ||
@@ -5,0 +5,0 @@ "repository": { |
@@ -141,3 +141,3 @@ /** | ||
evaluate<R extends GraphNode,N extends GraphNode>(root: R, expr: PathExpression<R,N>): Match<R,N> | ||
evaluate<R extends GraphNode,N extends GraphNode>(root: R, expr: PathExpression<R,N> | string): Match<R,N> | ||
@@ -147,3 +147,3 @@ /** | ||
*/ | ||
with<N extends GraphNode>(root: GraphNode, expr: string, f: (n: N) => void): void | ||
with<N extends GraphNode>(root: GraphNode, expr: PathExpression<GraphNode,N> | string, f: (n: N) => void): void | ||
@@ -153,10 +153,5 @@ /** | ||
*/ | ||
scalar<R extends GraphNode,N extends GraphNode>(root: R, expr: PathExpression<R,N>): N | ||
scalar<R extends GraphNode,N extends GraphNode>(root: R, expr: PathExpression<R,N> | string): N | ||
/** | ||
* Convenience method to eval scalar from string | ||
*/ | ||
scalarStr<R extends GraphNode,N extends GraphNode>(root: R, expr: string): N | ||
/** | ||
* Cast the present node to the given type | ||
@@ -163,0 +158,0 @@ */ |
@@ -40,6 +40,2 @@ "use strict"; | ||
}; | ||
TransformingPathExpressionEngine.prototype.scalarStr = function (root, expr) { | ||
var n = this.delegate.scalarStr(root, expr); | ||
return this.nodeTransform(n); | ||
}; | ||
TransformingPathExpressionEngine.prototype.as = function (root, name) { | ||
@@ -46,0 +42,0 @@ return this.nodeTransform(this.delegate.as(root, name)); |
@@ -1,2 +0,2 @@ | ||
import {PathExpressionEngine,PathExpression,Match,DynamicType,TreeNode} from "./PathExpression" | ||
import {PathExpressionEngine,PathExpression,Match,DynamicType,GraphNode,TreeNode} from "./PathExpression" | ||
@@ -19,3 +19,3 @@ /** | ||
// because they're in Scala | ||
evaluate<R extends TreeNode,N extends TreeNode>(root: R, expr: PathExpression<R,N>): Match<R,N> { | ||
evaluate<R extends TreeNode,N extends TreeNode>(root: R, expr: PathExpression<R,N> | string): Match<R,N> { | ||
let m1 = this.delegate.evaluate(root, expr) | ||
@@ -31,3 +31,3 @@ let m2 = { | ||
with<N extends TreeNode>(root: TreeNode, expr: string, | ||
with<N extends TreeNode>(root: TreeNode, expr: PathExpression<GraphNode,N> | string, | ||
f: (n: N) => void): void { | ||
@@ -42,11 +42,6 @@ this.delegate.with(root, expr, n => { | ||
scalar<R extends TreeNode,N extends TreeNode>(root: R, expr: PathExpression<R,N>): N { | ||
scalar<R extends TreeNode,N extends TreeNode>(root: R, expr: PathExpression<R,N> | string): N { | ||
return this.nodeTransform(this.delegate.scalar<R,N>(root, expr)) as N | ||
} | ||
scalarStr<R extends TreeNode,N extends TreeNode>(root: R, expr: string): N { | ||
let n = this.delegate.scalarStr<R,N>(root, expr) | ||
return this.nodeTransform(n) as N | ||
} | ||
as<N extends TreeNode>(root, name: string): N { | ||
@@ -53,0 +48,0 @@ return this.nodeTransform(this.delegate.as<N>(root, name)) as N |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
3429602
229
7744