@malloydata/malloy 0.0.200 → 0.0.201

package/dist/lang/ast/source-query-elements/sq-reference.js

@@ -63,7 +63,7 @@ class SQReference extends source_query_element_1.SourceQueryElement {
     }
     isSource() {
         const refTo = this.ref.getNamed();
-        return refTo !== undefined && (0, model_1.modelObjIsSource)(refTo);
+        return refTo !== undefined && (0, model_1.isSourceDef)(refTo);
     }
     getSource() {
         if (this.asSource) {
@@ -82,7 +82,7 @@ class SQReference extends source_query_element_1.SourceQueryElement {
             const existingQuery = new query_reference_1.QueryReference(this.ref);
             this.asSource = new query_source_1.QuerySource(existingQuery);
         }
-        else if ((0, model_1.modelObjIsSource)(entry)) {
+        else if ((0, model_1.isSourceDef)(entry)) {
             this.asSource = new named_source_1.NamedSource(this.ref, undefined, this.args);
         }
         else {

package/dist/lang/ast/types/malloy-element.js

@@ -120,7 +120,7 @@ class MalloyElement {
                     location: reference.location,
                 });
             }
-            else if (result && (0, malloy_types_1.modelObjIsSource)(result.entry)) {
+            else if (result && (0, malloy_types_1.isSourceDef)(result.entry)) {
                 this.addReference({
                     type: 'exploreReference',
                     text: key,
@@ -452,7 +452,7 @@ class Document extends MalloyElement {
             }
             for (const [nm, orig] of Object.entries(extendingModelDef.contents)) {
                 const entry = structuredClone(orig);
-                if ((0, malloy_types_1.modelObjIsSource)(entry) ||
+                if ((0, malloy_types_1.isSourceDef)(entry) ||
                     entry.type === 'query' ||
                     entry.type === 'function') {
                     const exported = extendingModelDef.exports.includes(nm);
@@ -511,7 +511,7 @@ class Document extends MalloyElement {
         }
         for (const entry in this.documentModel) {
             const entryDef = this.documentModel[entry].entry;
-            if ((0, malloy_types_1.modelObjIsSource)(entryDef) || entryDef.type === 'query') {
+            if ((0, malloy_types_1.isSourceDef)(entryDef) || entryDef.type === 'query') {
                 if (this.documentModel[entry].exported) {
                     def.exports.push(entry);
                 }
@@ -548,7 +548,7 @@ class Document extends MalloyElement {
         if (this.globalNameSpace.getEntry(str) !== undefined) {
             this.logError('name-conflict-with-global', `Cannot redefine '${str}', which is in global namespace`);
         }
-        if ((0, malloy_types_1.modelObjIsSource)(ent.entry)) {
+        if ((0, malloy_types_1.isSourceDef)(ent.entry)) {
             this.checkExperimentalDialect(this, ent.entry.dialect);
         }
         this.documentModel[str] = ent;

package/dist/lang/parse-malloy.js

@@ -680,7 +680,7 @@ class MalloyTranslation {
             if (did.translated) {
                 for (const fromChild of child.modelDef.exports) {
                     const modelEntry = child.modelDef.contents[fromChild];
-                    if ((0, malloy_types_1.modelObjIsSource)(modelEntry) || modelEntry.type === 'query') {
+                    if ((0, malloy_types_1.isSourceDef)(modelEntry) || modelEntry.type === 'query') {
                         exports[fromChild] = modelEntry;
                     }
                 }

package/dist/lang/test/test-translator.js

@@ -191,7 +191,7 @@ class TestRoot extends ast_1.MalloyElement {
         if (global)
             return global;
         const struct = this.modelDef.contents[name];
-        if ((0, malloy_types_1.modelObjIsSource)(struct)) {
+        if ((0, malloy_types_1.isSourceDef)(struct)) {
             const exported = this.modelDef.exports.includes(name);
             return { entry: struct, exported };
         }
@@ -345,7 +345,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
     }
     exploreFor(exploreName) {
         const explore = this.nameSpace[exploreName];
-        if (explore && (0, malloy_types_1.modelObjIsSource)(explore)) {
+        if (explore && (0, malloy_types_1.isSourceDef)(explore)) {
             return explore;
         }
         throw new Error(`Expected model to contain source '${exploreName}'`);
@@ -365,7 +365,7 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
         var _a;
         const t = this.translate().translated;
         const s = (_a = t === null || t === void 0 ? void 0 : t.modelDef) === null || _a === void 0 ? void 0 : _a.contents[srcName];
-        if (s && (0, malloy_types_1.modelObjIsSource)(s)) {
+        if (s && (0, malloy_types_1.isSourceDef)(s)) {
             return s;
         }
         return undefined;
@@ -391,7 +391,7 @@ class BetaExpression extends TestTranslator {
     }
     testFS() {
         const aStruct = this.internalModel.contents['ab'];
-        if ((0, malloy_types_1.modelObjIsSource)(aStruct)) {
+        if ((0, malloy_types_1.isSourceDef)(aStruct)) {
             const tstFS = new static_space_1.StaticSourceSpace(aStruct);
             return tstFS;
         }

package/dist/malloy.js

@@ -447,7 +447,7 @@ class Model {
      */
     getExploreByName(name) {
         const struct = this.modelDef.contents[name];
-        if ((0, model_1.modelObjIsSource)(struct)) {
+        if ((0, model_1.isSourceDef)(struct)) {
             return new Explore(struct);
         }
         throw new Error("'name' is not an explore");
@@ -459,7 +459,7 @@ class Model {
      */
     get explores() {
         return Object.values(this.modelDef.contents)
-            .filter(model_1.modelObjIsSource)
+            .filter(model_1.isSourceDef)
             .map(structDef => new Explore(structDef));
     }
     /**
@@ -524,7 +524,7 @@ class PreparedQuery {
         const source = typeof sourceRef === 'string'
             ? this._modelDef.contents[sourceRef]
             : sourceRef;
-        if (!(0, model_1.modelObjIsSource)(source)) {
+        if (!(0, model_1.isSourceDef)(source)) {
             throw new Error('Invalid source for query');
         }
         return source.dialect;
@@ -818,7 +818,7 @@ class PreparedResult {
         if (explore === undefined) {
             throw new Error('Malformed query result.');
         }
-        if ((0, model_1.modelObjIsSource)(explore)) {
+        if ((0, model_1.isSourceDef)(explore)) {
             return new Explore(explore);
         }
         throw new Error(`'${name} is not an explore`);

package/dist/model/malloy_query.js

@@ -3410,7 +3410,7 @@ class QueryModel {
         this.modelDef = modelDef;
         for (const s of Object.values(this.modelDef.contents)) {
             let qs;
-            if ((0, malloy_types_1.modelObjIsSource)(s)) {
+            if ((0, malloy_types_1.isSourceDef)(s)) {
                 qs = new QueryStruct(s, undefined, { model: this }, {});
                 this.structs.set((0, malloy_types_1.getIdentifier)(s), qs);
                 qs.resolveQueryFields();

package/dist/model/malloy_types.d.ts

@@ -595,7 +595,7 @@ export interface FinalizeSourceDef extends SourceDefBase {
     type: 'finalize';
 }
 export declare function sourceBase(sd: SourceDefBase): SourceDefBase;
-export declare function isSourceDef(sd: StructDef | FieldDef): sd is SourceDef;
+export declare function isSourceDef(sd: NamedModelObject | FieldDef): sd is SourceDef;
 export type SourceDef = TableSourceDef | SQLSourceDef | QuerySourceDef | QueryResultDef | FinalizeSourceDef | NestSourceDef;
 /** Is this the "FROM" table of a query tree */
 export declare function isBaseTable(def: StructDef): def is SourceDef;
@@ -669,7 +669,6 @@ export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 /** Get the output name for a NamedObject */
 export declare function getIdentifier(n: AliasedName): string;
 export type NamedModelObject = StructDef | NamedQuery | FunctionDef | ConnectionDef;
-export declare function modelObjIsSource(nmo: NamedModelObject): nmo is SourceDef;
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;

package/dist/model/malloy_types.js

@@ -23,7 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeEvalSpaces = exports.isLiteral = exports.isScalarArray = exports.isBaseTable = exports.isSourceDef = exports.sourceBase = exports.isSegmentSQL = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.structHasErrors = exports.segmentHasErrors = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.isJoinedSource = exports.isJoined = exports.isJoinable = exports.isMatrixOperation = exports.isRepeatedRecord = exports.arrayEachFields = exports.fieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTemporalField = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.paramHasValue = exports.isAsymmetricExpr = exports.exprIsLeaf = exports.exprHasE = exports.exprHasKids = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.getAtomicFields = exports.isAtomic = exports.isTurtleDef = exports.modelObjIsSource = exports.getIdentifier = exports.isLeafAtomic = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.getAtomicFields = exports.isAtomic = exports.isTurtleDef = exports.getIdentifier = exports.isLeafAtomic = void 0;
 function exprHasKids(e) {
     return 'kids' in e;
 }
@@ -337,10 +337,6 @@ function getIdentifier(n) {
     return n.name;
 }
 exports.getIdentifier = getIdentifier;
-function modelObjIsSource(nmo) {
-    return isSourceDef(nmo);
-}
-exports.modelObjIsSource = modelObjIsSource;
 function isTurtleDef(def) {
     return def.type === 'turtle';
 }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.200";
+export declare const MALLOY_VERSION = "0.0.201";

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.200';
+exports.MALLOY_VERSION = '0.0.201';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.200",
+  "version": "0.0.201",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",