@bessemer/cornerstone 0.5.24 → 0.5.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/expression/{expression-parser.d.ts → expression-mapper.d.ts} +1 -1
- package/dist/expression/{expression-parser.d.ts.map → expression-mapper.d.ts.map} +1 -1
- package/dist/expression/expression-mapper.js +31 -0
- package/dist/expression/expression-mapper.js.map +1 -0
- package/dist/expression/sql-expression-parser.d.ts +1 -1
- package/dist/expression/sql-expression-parser.js +2 -2
- package/dist/expression/sql-expression-parser.js.map +1 -1
- package/package.json +1 -1
- package/dist/expression/expression-parser.js +0 -28
- package/dist/expression/expression-parser.js.map +0 -1
|
@@ -6,4 +6,4 @@ export declare class ExpressionMapper<MappingType, ContextType> {
|
|
|
6
6
|
register<ExpressionType>(definition: ExpressionDefinition<any, any, ExpressionType>, resolver: ExpressionResolver<ExpressionType, MappingType, ContextType>): void;
|
|
7
7
|
}
|
|
8
8
|
export {};
|
|
9
|
-
//# sourceMappingURL=expression-
|
|
9
|
+
//# sourceMappingURL=expression-mapper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expression-
|
|
1
|
+
{"version":3,"file":"expression-mapper.d.ts","sourceRoot":"","sources":["../../src/expression/expression-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAMnF,KAAK,kBAAkB,CAAC,cAAc,EAAE,WAAW,EAAE,WAAW,IAAI,CAClE,UAAU,EAAE,cAAc,EAC1B,GAAG,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,WAAW,EACrD,OAAO,EAAE,WAAW,KACjB,WAAW,CAAA;AAEhB,qBAAa,gBAAgB,CAAC,WAAW,EAAE,WAAW;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoE;IAEhG,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,WAAW;IAoBvE,QAAQ,CAAC,cAAc,EACrB,UAAU,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAC1D,QAAQ,EAAE,kBAAkB,CAAC,cAAc,EAAE,WAAW,EAAE,WAAW,CAAC,GACrE,IAAI;CAGR"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
// src/expression/expression-mapper.ts
|
|
2
|
+
import { isExpression } from "@bessemer/cornerstone/expression/internal";
|
|
3
|
+
import { Preconditions } from "@bessemer/cornerstone";
|
|
4
|
+
import { value, ValueExpression } from "@bessemer/cornerstone/expression/expression";
|
|
5
|
+
var ExpressionMapper = class {
|
|
6
|
+
resolverMap = {};
|
|
7
|
+
map(expression, context) {
|
|
8
|
+
if (isExpression(expression)) {
|
|
9
|
+
const resolver = this.resolverMap[expression.expressionKey];
|
|
10
|
+
Preconditions.isPresent(
|
|
11
|
+
resolver,
|
|
12
|
+
`Illegal Argument - Attempted to map unknown expression: ${expression.expressionKey}. You must register(...) a handler for this expression type.`
|
|
13
|
+
);
|
|
14
|
+
return resolver(expression, (expression2) => this.map(expression2, context), context);
|
|
15
|
+
} else {
|
|
16
|
+
const resolver = this.resolverMap[ValueExpression.expressionKey];
|
|
17
|
+
Preconditions.isPresent(
|
|
18
|
+
resolver,
|
|
19
|
+
`Illegal Argument - Attempted to map unknown expression: ${ValueExpression.expressionKey}. You must register(...) a handler for this expression type.`
|
|
20
|
+
);
|
|
21
|
+
return resolver(expression, (expression2) => this.map(value(expression2), context), context);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
register(definition, resolver) {
|
|
25
|
+
this.resolverMap[definition.expressionKey] = resolver;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
export {
|
|
29
|
+
ExpressionMapper
|
|
30
|
+
};
|
|
31
|
+
//# sourceMappingURL=expression-mapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/expression/expression-mapper.ts"],"sourcesContent":["import { Expression, ExpressionDefinition } from '@bessemer/cornerstone/expression'\nimport { Dictionary } from '@bessemer/cornerstone/types'\nimport { isExpression } from '@bessemer/cornerstone/expression/internal'\nimport { Preconditions } from '@bessemer/cornerstone'\nimport { value, ValueExpression } from '@bessemer/cornerstone/expression/expression'\n\ntype ExpressionResolver<ExpressionType, MappingType, ContextType> = (\n expression: ExpressionType,\n map: (expression: Expression<unknown>) => MappingType,\n context: ContextType\n) => MappingType\n\nexport class ExpressionMapper<MappingType, ContextType> {\n private readonly resolverMap: Dictionary<ExpressionResolver<any, MappingType, ContextType>> = {}\n\n map(expression: Expression<unknown>, context: ContextType): MappingType {\n if (isExpression(expression)) {\n const resolver = this.resolverMap[expression.expressionKey]\n Preconditions.isPresent(\n resolver,\n `Illegal Argument - Attempted to map unknown expression: ${expression.expressionKey}. You must register(...) a handler for this expression type.`\n )\n\n return resolver(expression, (expression) => this.map(expression, context), context)\n } else {\n const resolver = this.resolverMap[ValueExpression.expressionKey]\n Preconditions.isPresent(\n resolver,\n `Illegal Argument - Attempted to map unknown expression: ${ValueExpression.expressionKey}. You must register(...) a handler for this expression type.`\n )\n\n return resolver(expression, (expression) => this.map(value(expression), context), context)\n }\n }\n\n register<ExpressionType>(\n definition: ExpressionDefinition<any, any, ExpressionType>,\n resolver: ExpressionResolver<ExpressionType, MappingType, ContextType>\n ): void {\n this.resolverMap[definition.expressionKey] = resolver\n }\n}\n"],"mappings":";AAEA,SAAS,oBAAoB;AAC7B,SAAS,qBAAqB;AAC9B,SAAS,OAAO,uBAAuB;AAQhC,IAAM,mBAAN,MAAiD;AAAA,EACrC,cAA6E,CAAC;AAAA,EAE/F,IAAI,YAAiC,SAAmC;AACtE,QAAI,aAAa,UAAU,GAAG;AAC5B,YAAM,WAAW,KAAK,YAAY,WAAW,aAAa;AAC1D,oBAAc;AAAA,QACZ;AAAA,QACA,2DAA2D,WAAW,aAAa;AAAA,MACrF;AAEA,aAAO,SAAS,YAAY,CAACA,gBAAe,KAAK,IAAIA,aAAY,OAAO,GAAG,OAAO;AAAA,IACpF,OAAO;AACL,YAAM,WAAW,KAAK,YAAY,gBAAgB,aAAa;AAC/D,oBAAc;AAAA,QACZ;AAAA,QACA,2DAA2D,gBAAgB,aAAa;AAAA,MAC1F;AAEA,aAAO,SAAS,YAAY,CAACA,gBAAe,KAAK,IAAI,MAAMA,WAAU,GAAG,OAAO,GAAG,OAAO;AAAA,IAC3F;AAAA,EACF;AAAA,EAEA,SACE,YACA,UACM;AACN,SAAK,YAAY,WAAW,aAAa,IAAI;AAAA,EAC/C;AACF;","names":["expression"]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExpressionMapper } from '@bessemer/cornerstone/expression/expression-
|
|
1
|
+
import { ExpressionMapper } from '@bessemer/cornerstone/expression/expression-mapper';
|
|
2
2
|
import { BasicType, Dictionary } from '@bessemer/cornerstone/types';
|
|
3
3
|
export type SqlExpressionMapperContext = {
|
|
4
4
|
variables: Dictionary<string>;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
// src/expression/sql-expression-parser.ts
|
|
2
2
|
import { BasicExpressions, Expressions } from "@bessemer/cornerstone/expression";
|
|
3
|
-
import { ExpressionMapper } from "@bessemer/cornerstone/expression/expression-
|
|
3
|
+
import { ExpressionMapper } from "@bessemer/cornerstone/expression/expression-mapper";
|
|
4
4
|
import { Arrays, Objects, Preconditions, Ulids } from "@bessemer/cornerstone";
|
|
5
5
|
var SqlExpressionMapper = new ExpressionMapper();
|
|
6
6
|
SqlExpressionMapper.register(Expressions.ValueExpression, (expression, _, context) => {
|
|
7
7
|
const value = expression.value;
|
|
8
8
|
const parameterName = `_${Ulids.generate()}`;
|
|
9
9
|
if (!Objects.isBasic(value)) {
|
|
10
|
-
throw new Error(`Unable to resolve complex ValueExpression as Sql: ${JSON.stringify(
|
|
10
|
+
throw new Error(`Unable to resolve complex ValueExpression as Sql: ${JSON.stringify(expression)}`);
|
|
11
11
|
}
|
|
12
12
|
context.parameters[parameterName] = value;
|
|
13
13
|
return `:${parameterName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/sql-expression-parser.ts"],"sourcesContent":["import { BasicExpressions, Expressions } from '@bessemer/cornerstone/expression'\nimport { ExpressionMapper } from '@bessemer/cornerstone/expression/expression-
|
|
1
|
+
{"version":3,"sources":["../../src/expression/sql-expression-parser.ts"],"sourcesContent":["import { BasicExpressions, Expressions } from '@bessemer/cornerstone/expression'\nimport { ExpressionMapper } from '@bessemer/cornerstone/expression/expression-mapper'\nimport { Arrays, Objects, Preconditions, Ulids } from '@bessemer/cornerstone'\nimport { BasicType, Dictionary } from '@bessemer/cornerstone/types'\n\n// JOHN need to add tests...\ntype SqlFragment = string\nexport type SqlExpressionMapperContext = {\n variables: Dictionary<string>\n parameters: Dictionary<BasicType>\n}\nexport const SqlExpressionMapper = new ExpressionMapper<SqlFragment, SqlExpressionMapperContext>()\n\nSqlExpressionMapper.register(Expressions.ValueExpression, (expression, _, context) => {\n const value = expression.value\n const parameterName = `_${Ulids.generate()}`\n if (!Objects.isBasic(value)) {\n throw new Error(`Unable to resolve complex ValueExpression as Sql: ${JSON.stringify(expression)}`)\n }\n\n context.parameters[parameterName] = value\n return `:${parameterName}`\n})\nSqlExpressionMapper.register(Expressions.VariableExpression, (expression, _, context) => {\n const variableName = context.variables[expression.name]\n Preconditions.isPresent(variableName, `Unable to resolve VariableExpression with name: ${expression.name}`)\n return variableName\n})\nSqlExpressionMapper.register(Expressions.NotExpression, (expression, map) => {\n return `(NOT ${map(expression.value)})`\n})\nSqlExpressionMapper.register(Expressions.AndExpression, (expression, map) => {\n return `(${expression.operands.map(map).join(' AND ')})`\n})\nSqlExpressionMapper.register(Expressions.OrExpression, (expression, map) => {\n return `(${expression.operands.map(map).join(' OR ')})`\n})\nSqlExpressionMapper.register(Expressions.EqualsExpression, (expression, map) => {\n const first = Arrays.first(expression.operands)!\n const rest = Arrays.rest(expression.operands)\n\n const mappedFirst = map(first)\n const equalsExpressions = rest.map((it) => `(${mappedFirst} = ${map(it)})`).join(' AND ')\n return `(${equalsExpressions})`\n})\n// SqlExpressionMapper.register(Expressions.ContainsExpression, (expression, map, context) => {\n// // JOHN incomplete\n// expression.collection\n// return `(someVariable IN (${expression.collection}))`\n// })\nSqlExpressionMapper.register(BasicExpressions.LessThanExpression, (expression, map) => {\n return `(${map(expression.left)} < ${map(expression.right)})`\n})\nSqlExpressionMapper.register(BasicExpressions.LessThanOrEqualExpression, (expression, map) => {\n return `(${map(expression.left)} <= ${map(expression.right)})`\n})\nSqlExpressionMapper.register(BasicExpressions.GreaterThanExpression, (expression, map) => {\n return `(${map(expression.left)} > ${map(expression.right)})`\n})\nSqlExpressionMapper.register(BasicExpressions.GreaterThanOrEqualExpression, (expression, map) => {\n return `(${map(expression.left)} >= ${map(expression.right)})`\n})\n"],"mappings":";AAAA,SAAS,kBAAkB,mBAAmB;AAC9C,SAAS,wBAAwB;AACjC,SAAS,QAAQ,SAAS,eAAe,aAAa;AAS/C,IAAM,sBAAsB,IAAI,iBAA0D;AAEjG,oBAAoB,SAAS,YAAY,iBAAiB,CAAC,YAAY,GAAG,YAAY;AACpF,QAAM,QAAQ,WAAW;AACzB,QAAM,gBAAgB,IAAI,MAAM,SAAS,CAAC;AAC1C,MAAI,CAAC,QAAQ,QAAQ,KAAK,GAAG;AAC3B,UAAM,IAAI,MAAM,qDAAqD,KAAK,UAAU,UAAU,CAAC,EAAE;AAAA,EACnG;AAEA,UAAQ,WAAW,aAAa,IAAI;AACpC,SAAO,IAAI,aAAa;AAC1B,CAAC;AACD,oBAAoB,SAAS,YAAY,oBAAoB,CAAC,YAAY,GAAG,YAAY;AACvF,QAAM,eAAe,QAAQ,UAAU,WAAW,IAAI;AACtD,gBAAc,UAAU,cAAc,mDAAmD,WAAW,IAAI,EAAE;AAC1G,SAAO;AACT,CAAC;AACD,oBAAoB,SAAS,YAAY,eAAe,CAAC,YAAY,QAAQ;AAC3E,SAAO,QAAQ,IAAI,WAAW,KAAK,CAAC;AACtC,CAAC;AACD,oBAAoB,SAAS,YAAY,eAAe,CAAC,YAAY,QAAQ;AAC3E,SAAO,IAAI,WAAW,SAAS,IAAI,GAAG,EAAE,KAAK,OAAO,CAAC;AACvD,CAAC;AACD,oBAAoB,SAAS,YAAY,cAAc,CAAC,YAAY,QAAQ;AAC1E,SAAO,IAAI,WAAW,SAAS,IAAI,GAAG,EAAE,KAAK,MAAM,CAAC;AACtD,CAAC;AACD,oBAAoB,SAAS,YAAY,kBAAkB,CAAC,YAAY,QAAQ;AAC9E,QAAM,QAAQ,OAAO,MAAM,WAAW,QAAQ;AAC9C,QAAM,OAAO,OAAO,KAAK,WAAW,QAAQ;AAE5C,QAAM,cAAc,IAAI,KAAK;AAC7B,QAAM,oBAAoB,KAAK,IAAI,CAAC,OAAO,IAAI,WAAW,MAAM,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,OAAO;AACxF,SAAO,IAAI,iBAAiB;AAC9B,CAAC;AAMD,oBAAoB,SAAS,iBAAiB,oBAAoB,CAAC,YAAY,QAAQ;AACrF,SAAO,IAAI,IAAI,WAAW,IAAI,CAAC,MAAM,IAAI,WAAW,KAAK,CAAC;AAC5D,CAAC;AACD,oBAAoB,SAAS,iBAAiB,2BAA2B,CAAC,YAAY,QAAQ;AAC5F,SAAO,IAAI,IAAI,WAAW,IAAI,CAAC,OAAO,IAAI,WAAW,KAAK,CAAC;AAC7D,CAAC;AACD,oBAAoB,SAAS,iBAAiB,uBAAuB,CAAC,YAAY,QAAQ;AACxF,SAAO,IAAI,IAAI,WAAW,IAAI,CAAC,MAAM,IAAI,WAAW,KAAK,CAAC;AAC5D,CAAC;AACD,oBAAoB,SAAS,iBAAiB,8BAA8B,CAAC,YAAY,QAAQ;AAC/F,SAAO,IAAI,IAAI,WAAW,IAAI,CAAC,OAAO,IAAI,WAAW,KAAK,CAAC;AAC7D,CAAC;","names":[]}
|
package/package.json
CHANGED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
// src/expression/expression-parser.ts
|
|
2
|
-
import { isExpression } from "@bessemer/cornerstone/expression/internal";
|
|
3
|
-
import { ValueExpression } from "@bessemer/cornerstone/expression/expression";
|
|
4
|
-
import { Preconditions } from "@bessemer/cornerstone";
|
|
5
|
-
var ExpressionMapper = class {
|
|
6
|
-
resolverMap = {};
|
|
7
|
-
map(expression, context) {
|
|
8
|
-
let expressionKey;
|
|
9
|
-
if (isExpression(expression)) {
|
|
10
|
-
expressionKey = expression.expressionKey;
|
|
11
|
-
} else {
|
|
12
|
-
expressionKey = ValueExpression.expressionKey;
|
|
13
|
-
}
|
|
14
|
-
const resolver = this.resolverMap[expressionKey];
|
|
15
|
-
Preconditions.isPresent(
|
|
16
|
-
resolver,
|
|
17
|
-
`Illegal Argument - Attempted to map unknown expression: ${expressionKey}. You must register(...) a handler for this expression type.`
|
|
18
|
-
);
|
|
19
|
-
return resolver(expression, (expression2) => this.map(expression2, context), context);
|
|
20
|
-
}
|
|
21
|
-
register(definition, resolver) {
|
|
22
|
-
this.resolverMap[definition.expressionKey] = resolver;
|
|
23
|
-
}
|
|
24
|
-
};
|
|
25
|
-
export {
|
|
26
|
-
ExpressionMapper
|
|
27
|
-
};
|
|
28
|
-
//# sourceMappingURL=expression-parser.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/expression/expression-parser.ts"],"sourcesContent":["import { Expression, ExpressionDefinition } from '@bessemer/cornerstone/expression'\nimport { Dictionary } from '@bessemer/cornerstone/types'\nimport { isExpression } from '@bessemer/cornerstone/expression/internal'\nimport { ValueExpression } from '@bessemer/cornerstone/expression/expression'\nimport { Preconditions } from '@bessemer/cornerstone'\n\ntype ExpressionResolver<ExpressionType, MappingType, ContextType> = (\n expression: ExpressionType,\n map: (expression: Expression<unknown>) => MappingType,\n context: ContextType\n) => MappingType\n\nexport class ExpressionMapper<MappingType, ContextType> {\n private readonly resolverMap: Dictionary<ExpressionResolver<any, MappingType, ContextType>> = {}\n\n map(expression: Expression<unknown>, context: ContextType): MappingType {\n let expressionKey: string\n if (isExpression(expression)) {\n expressionKey = expression.expressionKey\n } else {\n expressionKey = ValueExpression.expressionKey\n }\n\n const resolver = this.resolverMap[expressionKey]\n Preconditions.isPresent(\n resolver,\n `Illegal Argument - Attempted to map unknown expression: ${expressionKey}. You must register(...) a handler for this expression type.`\n )\n\n return resolver(expression, (expression) => this.map(expression, context), context)\n }\n\n register<ExpressionType>(\n definition: ExpressionDefinition<any, any, ExpressionType>,\n resolver: ExpressionResolver<ExpressionType, MappingType, ContextType>\n ): void {\n this.resolverMap[definition.expressionKey] = resolver\n }\n}\n"],"mappings":";AAEA,SAAS,oBAAoB;AAC7B,SAAS,uBAAuB;AAChC,SAAS,qBAAqB;AAQvB,IAAM,mBAAN,MAAiD;AAAA,EACrC,cAA6E,CAAC;AAAA,EAE/F,IAAI,YAAiC,SAAmC;AACtE,QAAI;AACJ,QAAI,aAAa,UAAU,GAAG;AAC5B,sBAAgB,WAAW;AAAA,IAC7B,OAAO;AACL,sBAAgB,gBAAgB;AAAA,IAClC;AAEA,UAAM,WAAW,KAAK,YAAY,aAAa;AAC/C,kBAAc;AAAA,MACZ;AAAA,MACA,2DAA2D,aAAa;AAAA,IAC1E;AAEA,WAAO,SAAS,YAAY,CAACA,gBAAe,KAAK,IAAIA,aAAY,OAAO,GAAG,OAAO;AAAA,EACpF;AAAA,EAEA,SACE,YACA,UACM;AACN,SAAK,YAAY,WAAW,aAAa,IAAI;AAAA,EAC/C;AACF;","names":["expression"]}
|