@malloydata/malloy 0.0.403 → 0.0.405

package/dist/model/query_query.js

@@ -404,9 +404,6 @@ class QueryQuery extends query_node_1.QueryField {
                         name,
                         fields: structDef.fields,
                         ...(structDef.annotations && { annotations: structDef.annotations }),
-                        ...(structDef.modelAnnotations && {
-                            modelAnnotations: structDef.modelAnnotations,
-                        }),
                         resultMetadata,
                         ...(queryTimezone && { queryTimezone }),
                     };
@@ -419,9 +416,6 @@ class QueryQuery extends query_node_1.QueryField {
                         name,
                         fields: structDef.fields,
                         ...(structDef.annotations && { annotations: structDef.annotations }),
-                        ...(structDef.modelAnnotations && {
-                            modelAnnotations: structDef.modelAnnotations,
-                        }),
                         resultMetadata,
                         ...(queryTimezone && { queryTimezone }),
                     };
@@ -513,9 +507,6 @@ class QueryQuery extends query_node_1.QueryField {
             resultMetadata: this.getResultMetadata(this.rootResult),
             queryTimezone: resultStruct.getQueryInfo().queryTimezone,
         };
-        if (this.parent.structDef.modelAnnotations) {
-            outputStruct.modelAnnotations = this.parent.structDef.modelAnnotations;
-        }
         return outputStruct;
     }
     getStructSourceSQL(qs, stageWriter) {
@@ -580,7 +571,7 @@ class QueryQuery extends query_node_1.QueryField {
                 return ret.lastStageName;
             }
             default:
-                throw new Error(`Cannot create SQL StageWriter from '${(0, malloy_types_1.getIdentifier)(qs.structDef)}' type '${qs.structDef.type}`);
+                throw new Error(`Cannot create SQL StageWriter from '${(0, malloy_types_1.activeName)(qs.structDef)}' type '${qs.structDef.type}`);
         }
     }
     /**
@@ -635,7 +626,7 @@ class QueryQuery extends query_node_1.QueryField {
         let s = '';
         const qs = ji.queryStruct;
         const qsDef = qs.structDef;
-        (_a = qs.eventStream) === null || _a === void 0 ? void 0 : _a.emit('join-used', { name: (0, malloy_types_1.getIdentifier)(qsDef) });
+        (_a = qs.eventStream) === null || _a === void 0 ? void 0 : _a.emit('join-used', { name: (0, malloy_types_1.activeName)(qsDef) });
         qs.maybeEmitParameterizedSourceUsage();
         if ((0, malloy_types_1.isJoinedSource)(qsDef)) {
             let structSQL = this.getStructSourceSQL(qs, stageWriter);
@@ -1218,11 +1209,9 @@ class QueryQuery extends query_node_1.QueryField {
             outputPipelinedSQL: [],
         };
         this.generateStage0Fields(this.rootResult, f, stageWriter);
-        if (this.firstSegment.type === 'project' &&
-            !this.parent.modelCompilerFlags().has('unsafe_complex_select_query')) {
+        if (this.firstSegment.type === 'project') {
             throw new malloy_compile_error_1.MalloyCompileError("Cannot use 'select:' in a stage that contains nested views. " +
-                'Use `group_by:` or restructure the pipeline. ' +
-                'Set `##! unsafe_complex_select_query` to bypass at your own risk.', 'compiler-project-with-turtles', this.fieldDef.location);
+                'Use `group_by:` or restructure the pipeline.', 'compiler-project-with-turtles', this.fieldDef.location);
         }
         const groupBy = 'GROUP BY ' + f.dimensionIndexes.join(',') + '\n';
         from += this.parent.dialect.sqlGroupSetTable(this.maxGroupSet) + '\n';
@@ -1821,9 +1810,6 @@ class QueryQueryIndex extends QueryQuery {
             ],
             connection: this.parent.connectionName,
         };
-        if (this.parent.structDef.modelAnnotations) {
-            ret.modelAnnotations = this.parent.structDef.modelAnnotations;
-        }
         return ret;
     }
 }

package/dist/model/source_def_utils.js

@@ -45,7 +45,6 @@ function mkQuerySourceDef(base, query, name) {
         location: base.location,
         // StructDefBase
         annotations: base.annotations,
-        modelAnnotations: base.modelAnnotations,
         fields: base.fields,
         // Filtered
         filterList: base.filterList,
@@ -84,7 +83,6 @@ function mkSQLSourceDef(base, selectStr, selectSegments) {
         location: base.location,
         // StructDefBase
         annotations: base.annotations,
-        modelAnnotations: base.modelAnnotations,
         fields: base.fields,
         // Filtered
         filterList: base.filterList,

package/dist/model/sql_block.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceRequest = getSourceRequest;

package/dist/model/utils.d.ts

@@ -1,4 +1,4 @@
-import type { AtomicTypeDef, Expr, FieldDef, GenericSQLExpr, GivenTypeDef, ModelDef, StructDef } from './malloy_types';
+import type { AtomicTypeDef, Expr, FieldDef, GenericSQLExpr, GivenTypeDef, ModelDef, ModelID, StructDef } from './malloy_types';
 import type { DialectFieldList } from '../dialect';
 /**
  * Format a typeDef as user-readable Malloy type syntax. Used in error
@@ -74,8 +74,15 @@ export declare class GenerateState {
     withApply(s: string): GenerateState;
     withTotal(groupSet: number): GenerateState;
 }
+/**
+ * Make a {@link ModelID} for a model. Pass the model's URL for a real model;
+ * omit it for a URL-less model to get a synthetic `"internal <uuid>"` id. The
+ * space makes the synthetic form an illegal URL so it can never collide with a
+ * real model URL.
+ */
+export declare function mkModelID(url?: string): ModelID;
 /**
  * Create an empty ModelDef with the given name.
  * Use this factory to ensure all required fields are present.
  */
-export declare function mkModelDef(name: string): ModelDef;
+export declare function mkModelDef(name: string, modelID?: ModelID): ModelDef;

package/dist/model/utils.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateState = exports.AndChain = void 0;
@@ -38,6 +20,7 @@ exports.getDialectFieldList = getDialectFieldList;
 exports.pathToKey = pathToKey;
 exports.groupingKey = groupingKey;
 exports.caseGroup = caseGroup;
+exports.mkModelID = mkModelID;
 exports.mkModelDef = mkModelDef;
 const uuid_1 = require("uuid");
 const sha256_1 = require("@noble/hashes/sha256");
@@ -270,9 +253,9 @@ function getDialectFieldList(structDef) {
     for (const f of structDef.fields.filter(malloy_types_1.fieldIsIntrinsic)) {
         dialectFieldList.push({
             typeDef: f,
-            sqlExpression: (0, malloy_types_1.getIdentifier)(f),
-            rawName: (0, malloy_types_1.getIdentifier)(f),
-            sqlOutputName: (0, malloy_types_1.getIdentifier)(f),
+            sqlExpression: (0, malloy_types_1.activeName)(f),
+            rawName: (0, malloy_types_1.activeName)(f),
+            sqlOutputName: (0, malloy_types_1.activeName)(f),
         });
     }
     return dialectFieldList;
@@ -326,16 +309,27 @@ class GenerateState {
     }
 }
 exports.GenerateState = GenerateState;
+/**
+ * Make a {@link ModelID} for a model. Pass the model's URL for a real model;
+ * omit it for a URL-less model to get a synthetic `"internal <uuid>"` id. The
+ * space makes the synthetic form an illegal URL so it can never collide with a
+ * real model URL.
+ */
+function mkModelID(url) {
+    return url !== null && url !== void 0 ? url : `internal ${(0, uuid_1.v4)()}`;
+}
 /**
  * Create an empty ModelDef with the given name.
  * Use this factory to ensure all required fields are present.
  */
-function mkModelDef(name) {
+function mkModelDef(name, modelID = mkModelID()) {
     return {
         name,
+        modelID,
         exports: [],
         contents: (0, malloy_types_1.mkSafeRecord)(),
         sourceRegistry: {},
+        modelAnnotations: {},
         queryList: [],
         dependencies: {},
     };

package/dist/run_sql_options.d.ts

@@ -1,10 +1,5 @@
-import type { AnnotationsDef } from './model/malloy_types';
 export interface RunSQLOptions {
     rowLimit?: number;
     abortSignal?: AbortSignal;
-    /** Model annotations forwarded to the adapter (e.g. `##!` dialect flags). */
-    modelAnnotations?: AnnotationsDef;
-    /** Query annotations forwarded to the adapter. */
-    queryAnnotations?: AnnotationsDef;
 }
 export type QueryOptionsReader = RunSQLOptions | (() => RunSQLOptions);

package/dist/run_sql_options.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=run_sql_options.js.map

package/dist/runtime_types.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=runtime_types.js.map

package/dist/test/cellsToObject.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cellsToObjects = cellsToObjects;

package/dist/timing.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timer = void 0;

package/dist/to_stable.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -50,7 +48,6 @@ const model_1 = require("./model");
 const annotation_1 = require("./api/foundation/annotation");
 const malloy_tag_1 = require("@malloydata/malloy-tag");
 function sourceDefToSourceInfo(sourceDef) {
-    var _a;
     const parameters = sourceDef.parameters && Object.entries(sourceDef.parameters).length > 0
         ? Object.entries(sourceDef.parameters).map(([name, parameter]) => {
             if ((0, model_1.isAtomic)(parameter)) {
@@ -73,7 +70,7 @@ function sourceDefToSourceInfo(sourceDef) {
         })
         : undefined;
     const sourceInfo = {
-        name: (_a = sourceDef.as) !== null && _a !== void 0 ? _a : sourceDef.name,
+        name: (0, model_1.activeName)(sourceDef),
         schema: {
             fields: convertFieldInfos(sourceDef, sourceDef.fields),
         },
@@ -183,7 +180,6 @@ function toStableAnnotations(annot) {
     return new annotation_1.Annotations(annot).texts().map(value => ({ value }));
 }
 function convertFieldInfos(source, fields) {
-    var _a, _b, _c;
     const result = [];
     for (const field of fields) {
         const isPublic = field.accessModifier === undefined;
@@ -202,7 +198,7 @@ function convertFieldInfos(source, fields) {
             ];
             const fieldInfo = {
                 kind: 'view',
-                name: (_a = field.as) !== null && _a !== void 0 ? _a : field.name,
+                name: (0, model_1.activeName)(field),
                 annotations: fieldAnnotations.length > 0 ? fieldAnnotations : undefined,
                 schema: { fields: convertFieldInfos(outputStruct, outputStruct.fields) },
             };
@@ -232,7 +228,7 @@ function convertFieldInfos(source, fields) {
             ];
             const fieldInfo = {
                 kind: aggregate ? 'measure' : 'dimension',
-                name: (_b = field.as) !== null && _b !== void 0 ? _b : field.name,
+                name: (0, model_1.activeName)(field),
                 type: typeDefToType(field),
                 annotations: fieldAnnotations.length > 0 ? fieldAnnotations : undefined,
             };
@@ -241,7 +237,7 @@ function convertFieldInfos(source, fields) {
         else if ((0, model_1.isJoinedSource)(field)) {
             const fieldInfo = {
                 kind: 'join',
-                name: (_c = field.as) !== null && _c !== void 0 ? _c : field.name,
+                name: (0, model_1.activeName)(field),
                 annotations,
                 schema: {
                     fields: convertFieldInfos(field, field.fields),
@@ -330,7 +326,7 @@ function identifierCode(name) {
     return `\`${escapeIdentifier(name)}\``;
 }
 function getResultStructMetadataAnnotation(field, resultMetadata) {
-    var _a, _b;
+    var _a;
     const tag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     let hasAny = false;
     if (resultMetadata.limit !== undefined) {
@@ -349,9 +345,9 @@ function getResultStructMetadataAnnotation(field, resultMetadata) {
         for (let i = 0; i < resultMetadata.orderBy.length; i++) {
             const orderBy = resultMetadata.orderBy[i];
             const orderByField = typeof orderBy.field === 'number'
-                ? ((_a = field.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field.fields[orderBy.field - 1].name)
+                ? (0, model_1.activeName)(field.fields[orderBy.field - 1])
                 : orderBy.field;
-            const direction = (_b = orderBy.dir) !== null && _b !== void 0 ? _b : null;
+            const direction = (_a = orderBy.dir) !== null && _a !== void 0 ? _a : null;
             tag.set(['ordered_by', i, orderByField], direction);
         }
         hasAny = true;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.403";
+export declare const MALLOY_VERSION = "0.0.405";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.403';
+exports.MALLOY_VERSION = '0.0.405';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.403",
+  "version": "0.0.405",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.403",
-    "@malloydata/malloy-interfaces": "0.0.403",
-    "@malloydata/malloy-tag": "0.0.403",
+    "@malloydata/malloy-filter": "0.0.405",
+    "@malloydata/malloy-interfaces": "0.0.405",
+    "@malloydata/malloy-tag": "0.0.405",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",

package/dist/lang/parse-tree-walkers/model-annotation-walker.d.ts

@@ -1,5 +0,0 @@
-import type { CommonTokenStream } from 'antlr4ts';
-import type { MalloyTranslation } from '../parse-malloy';
-import type { AnnotationsDef } from '../../model/malloy_types';
-import type { MalloyParseInfo } from '../malloy-parse-info';
-export declare function walkForModelAnnotation(forParse: MalloyTranslation, tokens: CommonTokenStream, parseInfo: MalloyParseInfo): AnnotationsDef;

package/dist/lang/parse-tree-walkers/model-annotation-walker.js

@@ -1,50 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkForModelAnnotation = walkForModelAnnotation;
-const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
-const parse_utils_1 = require("../parse-utils");
-class ModelAnnotationWalker {
-    constructor(translator, tokens, parseInfo) {
-        this.translator = translator;
-        this.tokens = tokens;
-        this.parseInfo = parseInfo;
-        this.notes = [];
-    }
-    enterDocAnnotations(pcx) {
-        for (const a of pcx.docAnnotation()) {
-            this.notes.push((0, parse_utils_1.noteFromAnnotation)(a, this.parseInfo));
-        }
-    }
-    get annotations() {
-        return { notes: this.notes };
-    }
-}
-function walkForModelAnnotation(forParse, tokens, parseInfo) {
-    const finder = new ModelAnnotationWalker(forParse, tokens, parseInfo);
-    const listener = finder;
-    ParseTreeWalker_1.ParseTreeWalker.DEFAULT.walk(listener, parseInfo.root);
-    return finder.annotations;
-}
-//# sourceMappingURL=model-annotation-walker.js.map