@malloydata/malloy 0.0.404 → 0.0.405

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 (287) 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 +2 -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.js +2 -20
  242. package/dist/lang/parse-malloy.d.ts +1 -9
  243. package/dist/lang/parse-malloy.js +8 -50
  244. package/dist/lang/parse-tree-walkers/document-completion-walker.js +2 -20
  245. package/dist/lang/parse-tree-walkers/document-help-context-walker.js +2 -20
  246. package/dist/lang/parse-tree-walkers/document-symbol-walker.js +2 -20
  247. package/dist/lang/parse-tree-walkers/explore-query-walker.js +2 -20
  248. package/dist/lang/parse-tree-walkers/find-external-references.js +2 -20
  249. package/dist/lang/parse-tree-walkers/find-table-path-walker.js +2 -20
  250. package/dist/lang/parse-utils.js +2 -20
  251. package/dist/lang/reference-list.js +2 -20
  252. package/dist/lang/run-malloy-parser.js +2 -4
  253. package/dist/lang/syntax-errors/custom-error-messages.js +2 -4
  254. package/dist/lang/syntax-errors/malloy-error-strategy.js +2 -4
  255. package/dist/lang/syntax-errors/malloy-parser-error-listener.js +2 -4
  256. package/dist/lang/test/expr-to-str.js +2 -4
  257. package/dist/lang/test/parse-expects.js +2 -20
  258. package/dist/lang/test/test-translator.js +4 -25
  259. package/dist/lang/translate-response.d.ts +1 -5
  260. package/dist/lang/translate-response.js +2 -20
  261. package/dist/lang/utils.js +2 -20
  262. package/dist/lang/zone.js +2 -20
  263. package/dist/model/annotation_utils.d.ts +37 -0
  264. package/dist/model/annotation_utils.js +85 -0
  265. package/dist/model/filter_compilers.js +2 -4
  266. package/dist/model/index.d.ts +2 -1
  267. package/dist/model/index.js +6 -21
  268. package/dist/model/malloy_types.d.ts +36 -7
  269. package/dist/model/malloy_types.js +2 -21
  270. package/dist/model/query_node.d.ts +0 -3
  271. package/dist/model/query_node.js +0 -10
  272. package/dist/model/query_query.js +2 -16
  273. package/dist/model/source_def_utils.js +0 -2
  274. package/dist/model/sql_block.js +2 -20
  275. package/dist/model/utils.d.ts +9 -2
  276. package/dist/model/utils.js +15 -21
  277. package/dist/run_sql_options.d.ts +0 -5
  278. package/dist/run_sql_options.js +2 -20
  279. package/dist/runtime_types.js +2 -20
  280. package/dist/test/cellsToObject.js +2 -4
  281. package/dist/timing.js +2 -4
  282. package/dist/to_stable.js +2 -4
  283. package/dist/version.d.ts +1 -1
  284. package/dist/version.js +1 -1
  285. package/package.json +4 -4
  286. package/dist/lang/parse-tree-walkers/model-annotation-walker.d.ts +0 -5
  287. 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.Document = exports.DocStatementList = exports.ListOf = exports.ExperimentalExperiment = exports.ModelEntryReference = exports.Unimplemented = exports.MalloyElement = void 0;
@@ -34,7 +16,6 @@ const ast_utils_1 = require("../ast-utils");
34
16
  const dialect_name_space_1 = require("./dialect-name-space");
35
17
  const global_name_space_1 = require("./global-name-space");
36
18
  const noteable_1 = require("./noteable");
37
- const uuid_1 = require("uuid");
38
19
  class MalloyElement {
39
20
  /**
40
21
  * @param kids All children passed to the constructor are not optional
@@ -173,6 +154,15 @@ class MalloyElement {
173
154
  const trans = this.translator();
174
155
  return (trans === null || trans === void 0 ? void 0 : trans.sourceURL) || '(missing)';
175
156
  }
157
+ /**
158
+ * The {@link ModelID} of the document this element is being compiled in — the
159
+ * key under which this model's `##` annotations and import/extend edges are
160
+ * recorded in `ModelDef.modelAnnotations`.
161
+ */
162
+ get modelID() {
163
+ var _a;
164
+ return (0, utils_1.mkModelID)((_a = this.translator()) === null || _a === void 0 ? void 0 : _a.sourceURL);
165
+ }
176
166
  log(code, parameters, options) {
177
167
  const log = (0, parse_log_1.makeLogMessage)(code, parameters, {
178
168
  at: this.location,
@@ -412,21 +402,6 @@ class DocStatementList extends ListOf {
412
402
  }
413
403
  }
414
404
  exports.DocStatementList = DocStatementList;
415
- const docAnnotationNameSpace = '5a79a191-06bc-43cf-9b12-58741cd82970';
416
- function annotationNotes(an) {
417
- const ret = an.inherits ? annotationNotes(an.inherits) : [];
418
- if (an.blockNotes) {
419
- ret.push(...an.blockNotes.map(n => n.text));
420
- }
421
- if (an.notes) {
422
- ret.push(...an.notes.map(n => n.text));
423
- }
424
- return ret;
425
- }
426
- function annotationID(a) {
427
- const allStrs = annotationNotes(a).join('');
428
- return (0, uuid_1.v5)(allStrs, docAnnotationNameSpace);
429
- }
430
405
  /**
431
406
  * The Document class is a little weird because we might need to bounce back
432
407
  * to the requestor, which might be on the other side of a wire, to get
@@ -462,16 +437,41 @@ class Document extends MalloyElement {
462
437
  this.documentModel = new Map();
463
438
  this.documentSrcRegistry = {};
464
439
  this.documentGivens = new Map();
440
+ /** {@link ModelAnnotationEntry} of every imported/extended model in the
441
+ * closure, keyed by ModelID, accumulated as imports/extends are processed;
442
+ * copied into the result `modelAnnotations` in {@link modelDef}, which then
443
+ * adds this model's own self-entry. */
444
+ this.documentModelAnnotations = {};
445
+ /** This model's **direct** import/extend predecessors, in fold order — the
446
+ * extend-base prepended as `import₀` (added first by {@link initModelDef}),
447
+ * then each `import`ed model's id appended. Becomes the self-entry's
448
+ * `inheritsFrom` in {@link modelDef}. */
449
+ this.documentInheritsFrom = [];
465
450
  this.queryList = [];
466
451
  this.didInitModel = false;
467
452
  this.modelWasModified = false;
468
453
  this.annotations = {};
469
454
  this.experiments = new malloy_tag_1.Tag({});
470
- this.modelAnnotationTodoList = [];
471
455
  this.dialectNameSpaces = new Map();
472
456
  this.statements = new DocStatementList(statements);
473
457
  this.has({ statements: statements });
474
458
  }
459
+ /**
460
+ * Merge another model's `##` annotation closure into this document and record
461
+ * it as a **direct** import/extend predecessor (its id appended to
462
+ * {@link documentInheritsFrom}). Shared by `import` and the extend-base init
463
+ * (`ImportStatement` and {@link initModelDef}) — they differ only in
464
+ * namespace/export copying, never in the annotation fold. First-writer wins
465
+ * on a closure-id collision (the diamond's shared model keeps one entry).
466
+ */
467
+ contributeModelAnnotations(other) {
468
+ for (const [id, entry] of Object.entries(other.modelAnnotations)) {
469
+ if (!(id in this.documentModelAnnotations)) {
470
+ this.documentModelAnnotations[id] = entry;
471
+ }
472
+ }
473
+ this.documentInheritsFrom.push(other.modelID);
474
+ }
475
475
  initModelDef(extendingModelDef) {
476
476
  if (this.didInitModel) {
477
477
  return;
@@ -482,9 +482,12 @@ class Document extends MalloyElement {
482
482
  this.explicitExports = undefined;
483
483
  this.queryList = [];
484
484
  if (extendingModelDef) {
485
- if (extendingModelDef.annotations) {
486
- this.annotations.inherits = extendingModelDef.annotations;
487
- }
485
+ // Extend-base is an implicit `import₀`: the base is this model's first
486
+ // direct predecessor (registered before any `import` runs), and its whole
487
+ // annotation closure comes along so anything the base imported stays
488
+ // resolvable. The base's own `##` rides the `inheritsFrom` edge, not a
489
+ // linear `inherits` chain.
490
+ this.contributeModelAnnotations(extendingModelDef);
488
491
  for (const [nm, orig] of Object.entries(extendingModelDef.contents)) {
489
492
  const entry = { ...orig };
490
493
  if ((0, malloy_types_1.isSourceDef)(entry) ||
@@ -510,16 +513,6 @@ class Document extends MalloyElement {
510
513
  if (needs === undefined) {
511
514
  this.checkGivenAliasCollisions();
512
515
  this.checkQueryGivenSatisfiability();
513
- for (const q of this.queryList) {
514
- if (q.modelAnnotations === undefined && modelDef.annotations) {
515
- q.modelAnnotations = modelDef.annotations;
516
- }
517
- }
518
- }
519
- if (modelDef.annotations) {
520
- for (const sd of this.modelAnnotationTodoList) {
521
- sd.modelAnnotations || (sd.modelAnnotations = modelDef.annotations);
522
- }
523
516
  }
524
517
  const ret = {
525
518
  modelDef: {
@@ -531,9 +524,6 @@ class Document extends MalloyElement {
531
524
  };
532
525
  return ret;
533
526
  }
534
- rememberToAddModelAnnotations(sd) {
535
- this.modelAnnotationTodoList.push(sd);
536
- }
537
527
  checkGivenAliasCollisions() {
538
528
  var _a, _b;
539
529
  const byId = new Map();
@@ -616,16 +606,19 @@ class Document extends MalloyElement {
616
606
  }
617
607
  currentModelAnnotation() {
618
608
  if (this.hasAnnotation()) {
619
- const ret = { ...this.annotations, id: '' };
620
- ret.id = annotationID(ret);
621
- return ret;
609
+ return { ...this.annotations };
622
610
  }
623
611
  }
624
612
  modelDef() {
625
- const def = (0, utils_1.mkModelDef)('');
626
- if (this.hasAnnotation()) {
627
- def.annotations = this.currentModelAnnotation();
628
- }
613
+ var _a;
614
+ const def = (0, utils_1.mkModelDef)('', this.modelID);
615
+ def.modelAnnotations = { ...this.documentModelAnnotations };
616
+ // Always record the self-entry — even with no own `##`, its `inheritsFrom`
617
+ // carries this model's import/extend edges, which the fold needs.
618
+ def.modelAnnotations[def.modelID] = {
619
+ ownNotes: (_a = this.currentModelAnnotation()) !== null && _a !== void 0 ? _a : {},
620
+ inheritsFrom: [...this.documentInheritsFrom],
621
+ };
629
622
  const explicit = this.explicitExports;
630
623
  const isExported = (name, modelEntry) => explicit ? explicit.has(name) : modelEntry.exported === true;
631
624
  for (const [name, modelEntry] of this.documentModel) {
@@ -636,16 +629,7 @@ class Document extends MalloyElement {
636
629
  if (isExported(name, modelEntry)) {
637
630
  def.exports.push(name);
638
631
  }
639
- if (entryDef.type === 'userType') {
640
- def.contents[name] = { ...entryDef };
641
- }
642
- else {
643
- const newEntry = { ...entryDef };
644
- if (newEntry.modelAnnotations === undefined && def.annotations) {
645
- newEntry.modelAnnotations = def.annotations;
646
- }
647
- def.contents[name] = newEntry;
648
- }
632
+ def.contents[name] = { ...entryDef };
649
633
  }
650
634
  else if (entryDef.type === 'given') {
651
635
  if (isExported(name, modelEntry)) {
@@ -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
  //# sourceMappingURL=model-entry.js.map
@@ -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
  //# sourceMappingURL=name-space.js.map
@@ -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.isNoteable = isNoteable;
@@ -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
  //# sourceMappingURL=op-desc.js.map
@@ -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
  //# sourceMappingURL=pipeline-comp.js.map
@@ -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
  //# sourceMappingURL=query-builder.js.map
@@ -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
  //# sourceMappingURL=query-comp.js.map
@@ -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.isQueryElement = isQueryElement;
@@ -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.isQueryExtendProperty = isQueryExtendProperty;
@@ -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
  //# sourceMappingURL=query-item.js.map
@@ -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.LegalRefinementStage = exports.QueryClass = 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.isQueryProperty = isQueryProperty;
@@ -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.SourceDesc = 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.isSourceProperty = isSourceProperty;
@@ -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.SpaceEntry = void 0;