@malloydata/malloy 0.0.404 → 0.0.406

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.
Files changed (293) hide show
  1. package/LICENSE +77 -0
  2. package/dist/api/asynchronous.js +2 -4
  3. package/dist/api/connection.js +2 -4
  4. package/dist/api/core.js +5 -6
  5. package/dist/api/foundation/annotation.js +3 -11
  6. package/dist/api/foundation/compile.js +15 -8
  7. package/dist/api/foundation/core.d.ts +44 -6
  8. package/dist/api/foundation/core.js +106 -31
  9. package/dist/api/foundation/runtime.js +9 -19
  10. package/dist/api/foundation/taggable.d.ts +5 -0
  11. package/dist/api/foundation/types.d.ts +15 -0
  12. package/dist/api/index.js +4 -6
  13. package/dist/api/sessioned.js +2 -4
  14. package/dist/api/stateless.js +2 -4
  15. package/dist/api/util.js +2 -4
  16. package/dist/connection/base_connection.js +2 -4
  17. package/dist/connection/types.d.ts +1 -3
  18. package/dist/connection_utils.js +2 -20
  19. package/dist/dialect/dialect.js +2 -20
  20. package/dist/dialect/dialect_map.js +2 -20
  21. package/dist/dialect/duckdb/dialect_functions.js +2 -4
  22. package/dist/dialect/duckdb/duckdb.js +2 -20
  23. package/dist/dialect/duckdb/function_overrides.js +2 -4
  24. package/dist/dialect/duckdb/index.js +2 -20
  25. package/dist/dialect/duckdb/table-path-parser.js +4 -4
  26. package/dist/dialect/functions/index.js +2 -20
  27. package/dist/dialect/functions/malloy_standard_functions.js +2 -4
  28. package/dist/dialect/functions/util.js +2 -21
  29. package/dist/dialect/index.js +2 -20
  30. package/dist/dialect/mysql/dialect_functions.js +2 -4
  31. package/dist/dialect/mysql/function_overrides.js +2 -4
  32. package/dist/dialect/mysql/index.js +2 -4
  33. package/dist/dialect/mysql/mysql.js +2 -20
  34. package/dist/dialect/pg_impl.js +2 -4
  35. package/dist/dialect/postgres/dialect_functions.js +2 -4
  36. package/dist/dialect/postgres/function_overrides.js +2 -4
  37. package/dist/dialect/postgres/index.js +2 -20
  38. package/dist/dialect/postgres/postgres.js +2 -20
  39. package/dist/dialect/snowflake/dialect_functions.js +2 -4
  40. package/dist/dialect/snowflake/function_overrides.js +2 -4
  41. package/dist/dialect/snowflake/index.js +2 -20
  42. package/dist/dialect/snowflake/snowflake.js +2 -20
  43. package/dist/dialect/standardsql/dialect_functions.js +2 -4
  44. package/dist/dialect/standardsql/function_overrides.js +2 -4
  45. package/dist/dialect/standardsql/index.js +2 -20
  46. package/dist/dialect/standardsql/standardsql.js +2 -20
  47. package/dist/dialect/tiny_parser.js +2 -4
  48. package/dist/dialect/trino/dialect_functions.js +2 -4
  49. package/dist/dialect/trino/function_overrides.js +2 -4
  50. package/dist/dialect/trino/index.js +2 -20
  51. package/dist/dialect/trino/trino.js +2 -20
  52. package/dist/index.js +4 -22
  53. package/dist/lang/ast/ast-utils.js +2 -20
  54. package/dist/lang/ast/error-factory.js +2 -20
  55. package/dist/lang/ast/expressions/apply.js +2 -20
  56. package/dist/lang/ast/expressions/binary-boolean.js +2 -20
  57. package/dist/lang/ast/expressions/binary-numeric.js +2 -20
  58. package/dist/lang/ast/expressions/boolean.js +2 -20
  59. package/dist/lang/ast/expressions/case.js +2 -4
  60. package/dist/lang/ast/expressions/constant-expression.js +2 -20
  61. package/dist/lang/ast/expressions/expr-add-sub.js +2 -20
  62. package/dist/lang/ast/expressions/expr-aggregate-function.js +2 -20
  63. package/dist/lang/ast/expressions/expr-alternation-tree.js +2 -20
  64. package/dist/lang/ast/expressions/expr-array-literal.js +2 -4
  65. package/dist/lang/ast/expressions/expr-asymmetric.js +2 -20
  66. package/dist/lang/ast/expressions/expr-avg.js +2 -20
  67. package/dist/lang/ast/expressions/expr-cast.js +2 -20
  68. package/dist/lang/ast/expressions/expr-coalesce.js +2 -20
  69. package/dist/lang/ast/expressions/expr-compare.js +2 -20
  70. package/dist/lang/ast/expressions/expr-count-distinct.js +2 -20
  71. package/dist/lang/ast/expressions/expr-count.js +2 -20
  72. package/dist/lang/ast/expressions/expr-filter-expr.js +2 -4
  73. package/dist/lang/ast/expressions/expr-func.js +2 -20
  74. package/dist/lang/ast/expressions/expr-granular-time.js +2 -20
  75. package/dist/lang/ast/expressions/expr-id-reference.js +2 -20
  76. package/dist/lang/ast/expressions/expr-logical-op.js +2 -20
  77. package/dist/lang/ast/expressions/expr-max.js +2 -20
  78. package/dist/lang/ast/expressions/expr-min.js +2 -20
  79. package/dist/lang/ast/expressions/expr-minus.js +2 -20
  80. package/dist/lang/ast/expressions/expr-mul-div.js +2 -20
  81. package/dist/lang/ast/expressions/expr-not.js +2 -20
  82. package/dist/lang/ast/expressions/expr-now.js +2 -20
  83. package/dist/lang/ast/expressions/expr-null.js +2 -20
  84. package/dist/lang/ast/expressions/expr-number.js +2 -20
  85. package/dist/lang/ast/expressions/expr-parens.js +2 -20
  86. package/dist/lang/ast/expressions/expr-props.js +2 -20
  87. package/dist/lang/ast/expressions/expr-record-literal.js +2 -4
  88. package/dist/lang/ast/expressions/expr-regex.js +2 -20
  89. package/dist/lang/ast/expressions/expr-string.js +4 -0
  90. package/dist/lang/ast/expressions/expr-sum.js +2 -20
  91. package/dist/lang/ast/expressions/expr-time-extract.js +2 -20
  92. package/dist/lang/ast/expressions/expr-time.js +2 -20
  93. package/dist/lang/ast/expressions/expr-ungroup.js +2 -20
  94. package/dist/lang/ast/expressions/for-range.js +2 -20
  95. package/dist/lang/ast/expressions/function-ordering.js +2 -20
  96. package/dist/lang/ast/expressions/grouped_by.js +2 -4
  97. package/dist/lang/ast/expressions/partial-compare.js +2 -20
  98. package/dist/lang/ast/expressions/partition_by.js +2 -20
  99. package/dist/lang/ast/expressions/pick-when.js +2 -20
  100. package/dist/lang/ast/expressions/range.js +2 -20
  101. package/dist/lang/ast/expressions/time-frame.js +2 -20
  102. package/dist/lang/ast/expressions/time-literal.js +2 -20
  103. package/dist/lang/ast/expressions/unary.js +2 -20
  104. package/dist/lang/ast/field-space/ast-view-field.js +2 -20
  105. package/dist/lang/ast/field-space/column-space-field.js +2 -20
  106. package/dist/lang/ast/field-space/def-space.js +2 -4
  107. package/dist/lang/ast/field-space/dynamic-space.js +2 -20
  108. package/dist/lang/ast/field-space/include-utils.js +2 -4
  109. package/dist/lang/ast/field-space/index-field-space.js +2 -20
  110. package/dist/lang/ast/field-space/ir-view-field.js +2 -20
  111. package/dist/lang/ast/field-space/join-space-field.js +2 -20
  112. package/dist/lang/ast/field-space/parameter-space.js +2 -4
  113. package/dist/lang/ast/field-space/passthrough-space.js +2 -4
  114. package/dist/lang/ast/field-space/permissive-space.js +2 -4
  115. package/dist/lang/ast/field-space/project-field-space.js +2 -20
  116. package/dist/lang/ast/field-space/query-input-space.js +2 -20
  117. package/dist/lang/ast/field-space/query-spaces.js +2 -20
  118. package/dist/lang/ast/field-space/reference-field.js +5 -21
  119. package/dist/lang/ast/field-space/refine-from-space-field.js +2 -4
  120. package/dist/lang/ast/field-space/refined-space.js +2 -20
  121. package/dist/lang/ast/field-space/rename-space-field.js +2 -20
  122. package/dist/lang/ast/field-space/static-space.js +2 -20
  123. package/dist/lang/ast/field-space/struct-space-field-base.js +2 -20
  124. package/dist/lang/ast/field-space/view-field.js +2 -20
  125. package/dist/lang/ast/index.js +2 -20
  126. package/dist/lang/ast/parameters/argument.js +2 -4
  127. package/dist/lang/ast/parameters/has-parameter.js +2 -20
  128. package/dist/lang/ast/query-builders/index-builder.js +2 -20
  129. package/dist/lang/ast/query-builders/partial-builder.js +4 -0
  130. package/dist/lang/ast/query-builders/project-builder.js +2 -20
  131. package/dist/lang/ast/query-builders/reduce-builder.js +2 -20
  132. package/dist/lang/ast/query-elements/anonymous-query.js +3 -21
  133. package/dist/lang/ast/query-elements/query-arrow.js +2 -20
  134. package/dist/lang/ast/query-elements/query-base.js +2 -20
  135. package/dist/lang/ast/query-elements/query-head-struct.js +2 -20
  136. package/dist/lang/ast/query-elements/query-raw.js +2 -20
  137. package/dist/lang/ast/query-elements/query-reference.js +2 -20
  138. package/dist/lang/ast/query-elements/query-refine.js +2 -20
  139. package/dist/lang/ast/query-items/field-declaration.js +3 -21
  140. package/dist/lang/ast/query-items/field-references.js +2 -20
  141. package/dist/lang/ast/query-items/typecheck_utils.js +2 -20
  142. package/dist/lang/ast/query-properties/aggregate.js +2 -20
  143. package/dist/lang/ast/query-properties/calculate.js +2 -20
  144. package/dist/lang/ast/query-properties/declare-fields.js +2 -20
  145. package/dist/lang/ast/query-properties/drill.js +2 -4
  146. package/dist/lang/ast/query-properties/extend.js +2 -20
  147. package/dist/lang/ast/query-properties/filters.js +2 -20
  148. package/dist/lang/ast/query-properties/group-by.js +2 -20
  149. package/dist/lang/ast/query-properties/indexing.js +2 -20
  150. package/dist/lang/ast/query-properties/limit.js +2 -20
  151. package/dist/lang/ast/query-properties/nest.js +6 -21
  152. package/dist/lang/ast/query-properties/nests.js +2 -20
  153. package/dist/lang/ast/query-properties/ordering.js +2 -20
  154. package/dist/lang/ast/query-properties/project-statement.js +2 -20
  155. package/dist/lang/ast/query-properties/qop-desc.js +2 -20
  156. package/dist/lang/ast/query-properties/sampling.js +2 -20
  157. package/dist/lang/ast/query-utils.js +2 -20
  158. package/dist/lang/ast/source-elements/composite-source.js +2 -4
  159. package/dist/lang/ast/source-elements/named-source.js +2 -23
  160. package/dist/lang/ast/source-elements/query-source.js +2 -22
  161. package/dist/lang/ast/source-elements/refined-source.js +2 -22
  162. package/dist/lang/ast/source-elements/source.js +2 -20
  163. package/dist/lang/ast/source-elements/sql-source.js +2 -25
  164. package/dist/lang/ast/source-elements/table-source.js +3 -22
  165. package/dist/lang/ast/source-elements/virtual-source.js +1 -2
  166. package/dist/lang/ast/source-properties/dimensions.js +2 -20
  167. package/dist/lang/ast/source-properties/field-list-edit.js +2 -20
  168. package/dist/lang/ast/source-properties/join.js +4 -26
  169. package/dist/lang/ast/source-properties/measures.js +2 -20
  170. package/dist/lang/ast/source-properties/primary-key.js +2 -20
  171. package/dist/lang/ast/source-properties/renames.js +3 -21
  172. package/dist/lang/ast/source-properties/timezone-statement.js +2 -20
  173. package/dist/lang/ast/source-properties/user-type-shape.js +9 -4
  174. package/dist/lang/ast/source-properties/view-field-declaration.js +6 -21
  175. package/dist/lang/ast/source-properties/views.js +2 -20
  176. package/dist/lang/ast/source-query-elements/include-item.js +2 -4
  177. package/dist/lang/ast/source-query-elements/source-query-element.js +2 -20
  178. package/dist/lang/ast/source-query-elements/sq-arrow.js +2 -20
  179. package/dist/lang/ast/source-query-elements/sq-compose.js +2 -4
  180. package/dist/lang/ast/source-query-elements/sq-extend.js +2 -20
  181. package/dist/lang/ast/source-query-elements/sq-reference.js +2 -20
  182. package/dist/lang/ast/source-query-elements/sq-refine.js +2 -20
  183. package/dist/lang/ast/source-query-elements/sq-source.js +2 -20
  184. package/dist/lang/ast/sql-elements/sql-string.js +2 -20
  185. package/dist/lang/ast/statements/define-given.js +22 -2
  186. package/dist/lang/ast/statements/define-query.js +3 -21
  187. package/dist/lang/ast/statements/define-source.js +7 -22
  188. package/dist/lang/ast/statements/define-user-type.js +1 -1
  189. package/dist/lang/ast/statements/import-statement.js +7 -20
  190. package/dist/lang/ast/time-utils.js +2 -20
  191. package/dist/lang/ast/typedesc-utils.js +2 -20
  192. package/dist/lang/ast/types/annotation-elements.js +2 -20
  193. package/dist/lang/ast/types/binary_operators.js +2 -4
  194. package/dist/lang/ast/types/definition-list.js +2 -20
  195. package/dist/lang/ast/types/dialect-name-space.js +2 -4
  196. package/dist/lang/ast/types/document-compile-result.js +2 -20
  197. package/dist/lang/ast/types/expr-result.js +2 -20
  198. package/dist/lang/ast/types/expr-value.js +2 -20
  199. package/dist/lang/ast/types/expression-def.js +2 -20
  200. package/dist/lang/ast/types/field-collection-member.js +2 -20
  201. package/dist/lang/ast/types/field-prop-statement.js +2 -20
  202. package/dist/lang/ast/types/field-space.js +2 -20
  203. package/dist/lang/ast/types/global-name-space.js +2 -20
  204. package/dist/lang/ast/types/granular-result.js +2 -20
  205. package/dist/lang/ast/types/literal.d.ts +1 -1
  206. package/dist/lang/ast/types/literal.js +2 -4
  207. package/dist/lang/ast/types/lookup-result.js +2 -20
  208. package/dist/lang/ast/types/malloy-element.d.ts +27 -4
  209. package/dist/lang/ast/types/malloy-element.js +54 -70
  210. package/dist/lang/ast/types/model-entry.js +2 -20
  211. package/dist/lang/ast/types/name-space.js +2 -20
  212. package/dist/lang/ast/types/noteable.js +2 -20
  213. package/dist/lang/ast/types/op-desc.js +2 -20
  214. package/dist/lang/ast/types/pipeline-comp.js +2 -20
  215. package/dist/lang/ast/types/query-builder.js +2 -20
  216. package/dist/lang/ast/types/query-comp.js +2 -20
  217. package/dist/lang/ast/types/query-element.js +2 -20
  218. package/dist/lang/ast/types/query-extend-property.js +2 -20
  219. package/dist/lang/ast/types/query-item.js +2 -20
  220. package/dist/lang/ast/types/query-property-interface.js +2 -20
  221. package/dist/lang/ast/types/query-property.js +2 -20
  222. package/dist/lang/ast/types/source-desc.js +2 -20
  223. package/dist/lang/ast/types/source-property.js +2 -20
  224. package/dist/lang/ast/types/space-entry.js +2 -20
  225. package/dist/lang/ast/types/space-field.js +2 -20
  226. package/dist/lang/ast/types/space-param.js +2 -20
  227. package/dist/lang/ast/types/time-result.js +2 -20
  228. package/dist/lang/ast/view-elements/qop-desc-view.js +2 -20
  229. package/dist/lang/ast/view-elements/reference-view.js +2 -20
  230. package/dist/lang/ast/view-elements/refine-utils.js +2 -20
  231. package/dist/lang/ast/view-elements/view-arrow.js +2 -20
  232. package/dist/lang/ast/view-elements/view-refine.js +2 -20
  233. package/dist/lang/ast/view-elements/view.js +2 -20
  234. package/dist/lang/composite-source-utils.js +2 -4
  235. package/dist/lang/field-utils.js +2 -20
  236. package/dist/lang/index.js +2 -20
  237. package/dist/lang/malloy-parse-info.js +2 -20
  238. package/dist/lang/malloy-to-ast.d.ts +1 -1
  239. package/dist/lang/malloy-to-ast.js +2 -21
  240. package/dist/lang/malloy-to-stable-query.js +2 -4
  241. package/dist/lang/parse-log.d.ts +5 -0
  242. package/dist/lang/parse-log.js +3 -20
  243. package/dist/lang/parse-malloy.d.ts +1 -9
  244. package/dist/lang/parse-malloy.js +33 -83
  245. package/dist/lang/parse-tree-walkers/document-completion-walker.js +2 -20
  246. package/dist/lang/parse-tree-walkers/document-help-context-walker.js +2 -20
  247. package/dist/lang/parse-tree-walkers/document-symbol-walker.js +2 -20
  248. package/dist/lang/parse-tree-walkers/explore-query-walker.js +2 -20
  249. package/dist/lang/parse-tree-walkers/find-external-references.js +2 -20
  250. package/dist/lang/parse-tree-walkers/find-table-path-walker.js +2 -20
  251. package/dist/lang/parse-utils.js +2 -20
  252. package/dist/lang/reference-list.js +2 -20
  253. package/dist/lang/run-malloy-parser.js +2 -4
  254. package/dist/lang/syntax-errors/custom-error-messages.js +2 -4
  255. package/dist/lang/syntax-errors/malloy-error-strategy.js +2 -4
  256. package/dist/lang/syntax-errors/malloy-parser-error-listener.js +2 -4
  257. package/dist/lang/test/expr-to-str.js +2 -4
  258. package/dist/lang/test/parse-expects.js +2 -20
  259. package/dist/lang/test/test-translator.js +4 -25
  260. package/dist/lang/translate-response.d.ts +1 -5
  261. package/dist/lang/translate-response.js +2 -20
  262. package/dist/lang/utils.js +2 -20
  263. package/dist/lang/zone.js +2 -20
  264. package/dist/model/annotation_utils.d.ts +37 -0
  265. package/dist/model/annotation_utils.js +85 -0
  266. package/dist/model/expression_compiler.js +5 -7
  267. package/dist/model/filter_compilers.js +2 -4
  268. package/dist/model/given_binding.d.ts +16 -4
  269. package/dist/model/given_binding.js +30 -4
  270. package/dist/model/index.d.ts +2 -1
  271. package/dist/model/index.js +6 -21
  272. package/dist/model/inline_expr.d.ts +10 -4
  273. package/dist/model/inline_expr.js +24 -26
  274. package/dist/model/malloy_types.d.ts +36 -7
  275. package/dist/model/malloy_types.js +2 -21
  276. package/dist/model/query_node.d.ts +0 -3
  277. package/dist/model/query_node.js +0 -10
  278. package/dist/model/query_query.js +2 -16
  279. package/dist/model/source_def_utils.js +0 -2
  280. package/dist/model/sql_block.js +2 -20
  281. package/dist/model/utils.d.ts +9 -2
  282. package/dist/model/utils.js +15 -21
  283. package/dist/run_sql_options.d.ts +0 -5
  284. package/dist/run_sql_options.js +2 -20
  285. package/dist/runtime_types.js +2 -20
  286. package/dist/test/cellsToObject.js +2 -4
  287. package/dist/timing.js +2 -4
  288. package/dist/to_stable.js +2 -4
  289. package/dist/version.d.ts +1 -1
  290. package/dist/version.js +1 -1
  291. package/package.json +4 -4
  292. package/dist/lang/parse-tree-walkers/model-annotation-walker.d.ts +0 -5
  293. package/dist/lang/parse-tree-walkers/model-annotation-walker.js +0 -50
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.JoinStatement = exports.ExpressionJoin = exports.KeyJoin = exports.Join = void 0;
@@ -62,7 +44,6 @@ class KeyJoin extends Join {
62
44
  this.elementType = 'joinOnKey';
63
45
  }
64
46
  getStructDef(parameterSpace) {
65
- var _a;
66
47
  const sourceDef = this.getStructDefFromExpr(parameterSpace);
67
48
  if (!(0, malloy_types_1.isJoinable)(sourceDef)) {
68
49
  throw this.internalError(`Cannot join struct type '${sourceDef.type}'`);
@@ -76,9 +57,8 @@ class KeyJoin extends Join {
76
57
  location: this.location,
77
58
  };
78
59
  if (this.note) {
79
- joinStruct.annotations = this.note;
60
+ joinStruct.annotations = { ...this.note };
80
61
  }
81
- (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
82
62
  return joinStruct;
83
63
  }
84
64
  fixupJoinOn(outer, inStruct) {
@@ -148,7 +128,6 @@ class ExpressionJoin extends Join {
148
128
  inStruct.refSummary = exprX.refSummary;
149
129
  }
150
130
  getStructDef(parameterSpace) {
151
- var _a;
152
131
  const source = this.sourceExpr.getSource();
153
132
  if (!source) {
154
133
  this.sourceExpr.sqLog('invalid-join-source', 'Cannot create a source to join from');
@@ -170,9 +149,8 @@ class ExpressionJoin extends Join {
170
149
  location: this.location,
171
150
  };
172
151
  if (this.note) {
173
- joinStruct.annotations = this.note;
152
+ joinStruct.annotations = { ...this.note };
174
153
  }
175
- (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
176
154
  return joinStruct;
177
155
  }
178
156
  }
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.Measures = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.PrimaryKey = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.Renames = exports.RenameField = void 0;
@@ -61,7 +43,7 @@ class RenameField extends malloy_element_1.MalloyElement {
61
43
  */
62
44
  if (oldValue.found) {
63
45
  if (oldValue.found instanceof space_field_1.SpaceField) {
64
- fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location, this.note));
46
+ fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location, this.note ? { ...this.note } : undefined));
65
47
  }
66
48
  else {
67
49
  this.logError('failed-rename', `'${this.oldName}' cannot be renamed`);
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.TimezoneStatement = void 0;
@@ -29,7 +29,7 @@ class UserTypeMemberDef extends UserTypeMember {
29
29
  typeDef: this.typeDef,
30
30
  };
31
31
  if (this.note) {
32
- field.annotations = this.note;
32
+ field.annotations = { ...this.note };
33
33
  }
34
34
  return field;
35
35
  }
@@ -77,11 +77,16 @@ class UserTypeMemberIndirect extends UserTypeMember {
77
77
  const field = { name: this.name, typeDef };
78
78
  if (this.note) {
79
79
  field.annotations = modelEntry.entry.annotations
80
- ? { ...this.note, inherits: modelEntry.entry.annotations }
81
- : this.note;
80
+ ? {
81
+ ...this.note,
82
+ inherits: modelEntry.entry.annotations,
83
+ }
84
+ : { ...this.note };
82
85
  }
83
86
  else if (modelEntry.entry.annotations) {
84
- field.annotations = { inherits: modelEntry.entry.annotations };
87
+ field.annotations = {
88
+ inherits: modelEntry.entry.annotations,
89
+ };
85
90
  }
86
91
  return field;
87
92
  }
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.ViewFieldDeclaration = void 0;
@@ -50,7 +32,10 @@ class ViewFieldDeclaration extends malloy_element_1.MalloyElement {
50
32
  type: 'turtle',
51
33
  name: this.name,
52
34
  pipeline: checkedPipeline,
53
- annotations: { ...this.note, inherits: annotations },
35
+ annotations: {
36
+ ...this.note,
37
+ inherits: annotations,
38
+ },
54
39
  location: this.location,
55
40
  };
56
41
  return def;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.Views = void 0;
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright (c) Meta Platforms, Inc. and affiliates.
4
- *
5
- * This source code is licensed under the MIT license found in the
6
- * LICENSE file in the root directory of this source tree.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
7
5
  */
8
6
  Object.defineProperty(exports, "__esModule", { value: true });
9
7
  exports.IncludeListItem = exports.IncludeExceptItem = exports.IncludeAccessItem = exports.IncludeItem = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SourceQueryElement = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQArrow = void 0;
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright (c) Meta Platforms, Inc. and affiliates.
4
- *
5
- * This source code is licensed under the MIT license found in the
6
- * LICENSE file in the root directory of this source tree.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
7
5
  */
8
6
  Object.defineProperty(exports, "__esModule", { value: true });
9
7
  exports.SQCompose = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQExtend = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQReference = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQRefine = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQSource = void 0;
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.SQLString = void 0;
@@ -161,6 +161,26 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
161
161
  operators: [...bad].sort().join(', '),
162
162
  });
163
163
  }
164
+ // An inline default may fold an unsupplied `$REF` to that
165
+ // given's declared default, so every reachable regular default
166
+ // must also be inline-reducible. The closure is flat; inline
167
+ // members self-validate at their own declaration, so only
168
+ // regular ones need checking here.
169
+ for (const g of givenUsage !== null && givenUsage !== void 0 ? givenUsage : []) {
170
+ const refDecl = doc.documentGivens.get(g.id);
171
+ if (!refDecl || refDecl.inline || refDecl.default === undefined) {
172
+ continue;
173
+ }
174
+ const refBad = new Set();
175
+ collectInlineBadOps(refDecl.default, refBad);
176
+ if (refBad.size > 0) {
177
+ this.default.logError('inline-bad-operator-in-ref', {
178
+ name: this.name,
179
+ refName: refDecl.name,
180
+ operators: [...refBad].sort().join(', '),
181
+ });
182
+ }
183
+ }
164
184
  }
165
185
  }
166
186
  }
@@ -173,7 +193,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
173
193
  defaultText,
174
194
  givenUsage,
175
195
  location: this.location,
176
- annotations: this.note,
196
+ annotations: this.note ? { ...this.note } : undefined,
177
197
  ...(this.inline ? { inline: true } : {}),
178
198
  };
179
199
  doc.documentGivens.set(id, givenIR);
@@ -195,7 +215,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
195
215
  },
196
216
  definition: {
197
217
  type: (0, utils_1.typeDefToString)(this.typeDef),
198
- annotations: this.note,
218
+ annotations: this.note ? { ...this.note } : undefined,
199
219
  location: this.location,
200
220
  defaultText,
201
221
  },
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.DefineQueryList = exports.DefineQuery = void 0;
@@ -54,7 +36,7 @@ class DefineQuery extends malloy_element_1.MalloyElement {
54
36
  if (this.note) {
55
37
  entry.annotations = entry.annotations
56
38
  ? { ...this.note, inherits: entry.annotations }
57
- : this.note;
39
+ : { ...this.note };
58
40
  }
59
41
  doc.setEntry(this.name, { entry, exported: true });
60
42
  }
@@ -1,25 +1,7 @@
1
1
  "use strict";
2
2
  /*
3
- * Copyright 2023 Google LLC
4
- *
5
- * Permission is hereby granted, free of charge, to any person obtaining
6
- * a copy of this software and associated documentation files
7
- * (the "Software"), to deal in the Software without restriction,
8
- * including without limitation the rights to use, copy, modify, merge,
9
- * publish, distribute, sublicense, and/or sell copies of the Software,
10
- * and to permit persons to whom the Software is furnished to do so,
11
- * subject to the following conditions:
12
- *
13
- * The above copyright notice and this permission notice shall be
14
- * included in all copies or substantial portions of the Software.
15
- *
16
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3
+ * Copyright Contributors to the Malloy project
4
+ * SPDX-License-Identifier: MIT
23
5
  */
24
6
  Object.defineProperty(exports, "__esModule", { value: true });
25
7
  exports.DefineSourceList = exports.DefineSource = void 0;
@@ -70,8 +52,11 @@ class DefineSource extends malloy_element_1.MalloyElement {
70
52
  };
71
53
  if (this.note) {
72
54
  entry.annotations = structDef.annotations
73
- ? { ...this.note, inherits: structDef.annotations }
74
- : this.note;
55
+ ? {
56
+ ...this.note,
57
+ inherits: structDef.annotations,
58
+ }
59
+ : { ...this.note };
75
60
  }
76
61
  if ((0, malloy_types_1.isPersistableSourceDef)(entry)) {
77
62
  entry.sourceID = (0, source_def_utils_1.mkSourceID)(this.name, (_b = this.location) === null || _b === void 0 ? void 0 : _b.url);
@@ -66,7 +66,7 @@ class DefineUserType extends malloy_element_1.MalloyElement {
66
66
  location: this.location,
67
67
  };
68
68
  if (this.note) {
69
- entry.annotations = this.note;
69
+ entry.annotations = { ...this.note };
70
70
  }
71
71
  doc.setEntry(this.name, { entry, exported: this.exported });
72
72
  }