@bessemer/cornerstone 0.5.28 → 0.5.29

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.
@@ -1,8 +1,8 @@
1
1
  import { ExpressionMapper } from '@bessemer/cornerstone/expression/expression-mapper';
2
2
  import { BasicType, Dictionary } from '@bessemer/cornerstone/types';
3
- export type SqlExpressionMapperContext = {
3
+ export type SqlExpressionParserContext = {
4
4
  variables: Dictionary<string>;
5
5
  parameters: Dictionary<BasicType>;
6
6
  };
7
- export declare const SqlExpressionMapper: ExpressionMapper<string, SqlExpressionMapperContext>;
7
+ export declare const SqlExpressionParser: ExpressionMapper<string, SqlExpressionParserContext>;
8
8
  //# sourceMappingURL=sql-expression-parser.d.ts.map
@@ -2,8 +2,8 @@
2
2
  import { BasicExpressions, Expressions } from "@bessemer/cornerstone/expression";
3
3
  import { ExpressionMapper } from "@bessemer/cornerstone/expression/expression-mapper";
4
4
  import { Arrays, Objects, Preconditions, Ulids } from "@bessemer/cornerstone";
5
- var SqlExpressionMapper = new ExpressionMapper();
6
- SqlExpressionMapper.register(Expressions.ValueExpression, (expression, _, context) => {
5
+ var SqlExpressionParser = new ExpressionMapper();
6
+ SqlExpressionParser.register(Expressions.ValueExpression, (expression, _, context) => {
7
7
  const value = expression.value;
8
8
  const parameterName = `_${Ulids.generate()}`;
9
9
  if (!Objects.isBasic(value)) {
@@ -12,40 +12,40 @@ SqlExpressionMapper.register(Expressions.ValueExpression, (expression, _, contex
12
12
  context.parameters[parameterName] = value;
13
13
  return `:${parameterName}`;
14
14
  });
15
- SqlExpressionMapper.register(Expressions.VariableExpression, (expression, _, context) => {
15
+ SqlExpressionParser.register(Expressions.VariableExpression, (expression, _, context) => {
16
16
  const variableName = context.variables[expression.name];
17
17
  Preconditions.isPresent(variableName, `Unable to resolve VariableExpression with name: ${expression.name}`);
18
18
  return variableName;
19
19
  });
20
- SqlExpressionMapper.register(Expressions.NotExpression, (expression, map) => {
20
+ SqlExpressionParser.register(Expressions.NotExpression, (expression, map) => {
21
21
  return `(NOT ${map(expression.value)})`;
22
22
  });
23
- SqlExpressionMapper.register(Expressions.AndExpression, (expression, map) => {
23
+ SqlExpressionParser.register(Expressions.AndExpression, (expression, map) => {
24
24
  return `(${expression.operands.map(map).join(" AND ")})`;
25
25
  });
26
- SqlExpressionMapper.register(Expressions.OrExpression, (expression, map) => {
26
+ SqlExpressionParser.register(Expressions.OrExpression, (expression, map) => {
27
27
  return `(${expression.operands.map(map).join(" OR ")})`;
28
28
  });
29
- SqlExpressionMapper.register(Expressions.EqualsExpression, (expression, map) => {
29
+ SqlExpressionParser.register(Expressions.EqualsExpression, (expression, map) => {
30
30
  const first = Arrays.first(expression.operands);
31
31
  const rest = Arrays.rest(expression.operands);
32
32
  const mappedFirst = map(first);
33
33
  const equalsExpressions = rest.map((it) => `(${mappedFirst} = ${map(it)})`).join(" AND ");
34
34
  return `(${equalsExpressions})`;
35
35
  });
36
- SqlExpressionMapper.register(BasicExpressions.LessThanExpression, (expression, map) => {
36
+ SqlExpressionParser.register(BasicExpressions.LessThanExpression, (expression, map) => {
37
37
  return `(${map(expression.left)} < ${map(expression.right)})`;
38
38
  });
39
- SqlExpressionMapper.register(BasicExpressions.LessThanOrEqualExpression, (expression, map) => {
39
+ SqlExpressionParser.register(BasicExpressions.LessThanOrEqualExpression, (expression, map) => {
40
40
  return `(${map(expression.left)} <= ${map(expression.right)})`;
41
41
  });
42
- SqlExpressionMapper.register(BasicExpressions.GreaterThanExpression, (expression, map) => {
42
+ SqlExpressionParser.register(BasicExpressions.GreaterThanExpression, (expression, map) => {
43
43
  return `(${map(expression.left)} > ${map(expression.right)})`;
44
44
  });
45
- SqlExpressionMapper.register(BasicExpressions.GreaterThanOrEqualExpression, (expression, map) => {
45
+ SqlExpressionParser.register(BasicExpressions.GreaterThanOrEqualExpression, (expression, map) => {
46
46
  return `(${map(expression.left)} >= ${map(expression.right)})`;
47
47
  });
48
48
  export {
49
- SqlExpressionMapper
49
+ SqlExpressionParser
50
50
  };
51
51
  //# sourceMappingURL=sql-expression-parser.js.map
@@ -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-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(value)}`)\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,KAAK,CAAC,EAAE;AAAA,EAC9F;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":[]}
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 SqlExpressionParserContext = {\n variables: Dictionary<string>\n parameters: Dictionary<BasicType>\n}\nexport const SqlExpressionParser = new ExpressionMapper<SqlFragment, SqlExpressionParserContext>()\n\nSqlExpressionParser.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(value)}`)\n }\n\n context.parameters[parameterName] = value\n return `:${parameterName}`\n})\nSqlExpressionParser.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})\nSqlExpressionParser.register(Expressions.NotExpression, (expression, map) => {\n return `(NOT ${map(expression.value)})`\n})\nSqlExpressionParser.register(Expressions.AndExpression, (expression, map) => {\n return `(${expression.operands.map(map).join(' AND ')})`\n})\nSqlExpressionParser.register(Expressions.OrExpression, (expression, map) => {\n return `(${expression.operands.map(map).join(' OR ')})`\n})\nSqlExpressionParser.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// })\nSqlExpressionParser.register(BasicExpressions.LessThanExpression, (expression, map) => {\n return `(${map(expression.left)} < ${map(expression.right)})`\n})\nSqlExpressionParser.register(BasicExpressions.LessThanOrEqualExpression, (expression, map) => {\n return `(${map(expression.left)} <= ${map(expression.right)})`\n})\nSqlExpressionParser.register(BasicExpressions.GreaterThanExpression, (expression, map) => {\n return `(${map(expression.left)} > ${map(expression.right)})`\n})\nSqlExpressionParser.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,KAAK,CAAC,EAAE;AAAA,EAC9F;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,7 +1,7 @@
1
1
  {
2
2
  "name": "@bessemer/cornerstone",
3
3
  "type": "module",
4
- "version": "0.5.28",
4
+ "version": "0.5.29",
5
5
  "module": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
7
7
  "sideEffects": false,