@malloydata/malloy 0.0.403 → 0.0.404

package/dist/to_stable.js

@@ -50,7 +50,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 +72,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 +182,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 +200,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 +230,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 +239,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 +328,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 +347,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.404";

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.404';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.403",
+  "version": "0.0.404",
   "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.404",
+    "@malloydata/malloy-interfaces": "0.0.404",
+    "@malloydata/malloy-tag": "0.0.404",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",