@malloydata/malloy-tests 0.0.237-dev250224215546 → 0.0.237-dev250225144145

package/package.json

@@ -21,13 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.237-dev250224215546",
-    "@malloydata/db-duckdb": "^0.0.237-dev250224215546",
-    "@malloydata/db-postgres": "^0.0.237-dev250224215546",
-    "@malloydata/db-snowflake": "^0.0.237-dev250224215546",
-    "@malloydata/db-trino": "^0.0.237-dev250224215546",
-    "@malloydata/malloy": "^0.0.237-dev250224215546",
-    "@malloydata/render": "^0.0.237-dev250224215546",
+    "@malloydata/db-bigquery": "^0.0.237-dev250225144145",
+    "@malloydata/db-duckdb": "^0.0.237-dev250225144145",
+    "@malloydata/db-postgres": "^0.0.237-dev250225144145",
+    "@malloydata/db-snowflake": "^0.0.237-dev250225144145",
+    "@malloydata/db-trino": "^0.0.237-dev250225144145",
+    "@malloydata/malloy": "^0.0.237-dev250225144145",
+    "@malloydata/malloy-tag": "^0.0.237-dev250225144145",
+    "@malloydata/render": "^0.0.237-dev250225144145",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -37,5 +38,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.237-dev250224215546"
+  "version": "0.0.237-dev250225144145"
 }

package/src/core/dependencies.spec.ts

@@ -39,7 +39,13 @@ describe('dependencies', () => {
   it('typescript references should not be circular', async () => {
     const deps = await madge('packages', {
       fileExtensions: ['ts'],
-      excludeRegExp: [/malloy\/src\/lang/, /malloy-render\/src/, /\.d\.ts/],
+      excludeRegExp: [
+        /malloy\/src\/lang/,
+        /malloy-render\/src/,
+        /\.d\.ts/,
+        /malloy-interfaces\/generated-types/,
+        /malloy-tag\/src\/lib/,
+      ],
     });
     expect(deps.circular().length, getMessage(deps.circular())).toBe(0);
   });
@@ -55,7 +61,12 @@ describe('dependencies', () => {
   it.skip('malloy/src/lang typescript should not be circular', async () => {
     const deps = await madge('packages', {
       fileExtensions: ['ts'],
-      excludeRegExp: [/malloy\/src\/lang\/lib/, /\.d\.ts/],
+      excludeRegExp: [
+        /malloy-render\/src/,
+        /\.d\.ts/,
+        /malloy-interfaces\/generated-types/,
+        /malloy-tag\/src\/lib/,
+      ],
     });
     expect(deps.circular().length, getMessage(deps.circular())).toBe(0);
   });
@@ -64,7 +75,26 @@ describe('dependencies', () => {
   it.skip('malloy-render/src typescript should not be circular', async () => {
     const deps = await madge('packages', {
       fileExtensions: ['ts'],
-      excludeRegExp: [/malloy-render\/src/, /\.d\.ts/],
+      excludeRegExp: [
+        /malloy\/src\/lang/,
+        /\.d\.ts/,
+        /malloy-interfaces\/generated-types/,
+        /malloy-tag\/src\/lib/,
+      ],
+    });
+    expect(deps.circular().length, getMessage(deps.circular())).toBe(0);
+  });
+
+  // TODO: remove circular references in malloy-tag
+  it.skip('malloy-tag/src typescript should not be circular', async () => {
+    const deps = await madge('packages', {
+      fileExtensions: ['ts'],
+      excludeRegExp: [
+        /malloy\/src\/lang/,
+        /malloy-render\/src/,
+        /\.d\.ts/,
+        /malloy-interfaces\/generated-types/,
+      ],
     });
     expect(deps.circular().length, getMessage(deps.circular())).toBe(0);
   });

package/src/core/tags.spec.ts

@@ -21,7 +21,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import {TagDict, Tag} from '@malloydata/malloy';
+import {annotationToTag} from '@malloydata/malloy';
+import {TagDict, Tag} from '@malloydata/malloy-tag';
 import {runtimeFor} from '../runtimes';
 
 declare global {
@@ -36,7 +37,7 @@ declare global {
 expect.extend({
   tagsAre(src: string | Tag, result: Tag) {
     if (typeof src === 'string') {
-      const {tag, log} = Tag.fromTagline(src, undefined);
+      const {tag, log} = Tag.fromTagLine(src, undefined);
       const errs = log.map(e => e.message);
       if (log.length > 0) {
         return {
@@ -64,243 +65,6 @@ expect.extend({
 
 const runtime = runtimeFor('duckdb');
 
-type TagTestTuple = [string, TagDict];
-describe('tagParse to Tag', () => {
-  const tagTests: TagTestTuple[] = [
-    ['just_name', {just_name: {}}],
-    ['name=bare_string', {name: {eq: 'bare_string'}}],
-    ['name="quoted_string"', {name: {eq: 'quoted_string'}}],
-    ['name {prop1}', {name: {properties: {prop1: {}}}}],
-    [
-      'name {prop1 prop2=value}',
-      {
-        name: {
-          properties: {
-            prop1: {},
-            prop2: {eq: 'value'},
-          },
-        },
-      },
-    ],
-    ['name.prop', {name: {properties: {prop: {}}}}],
-    ['name.prop=value', {name: {properties: {prop: {eq: 'value'}}}}],
-    [
-      'name.prop.sub=value',
-      {name: {properties: {prop: {properties: {sub: {eq: 'value'}}}}}},
-    ],
-    [
-      'name{first3=[a, b, c]}',
-      {name: {properties: {first3: {eq: [{eq: 'a'}, {eq: 'b'}, {eq: 'c'}]}}}},
-    ],
-    ['name{first1=[a,]}', {name: {properties: {first1: {eq: [{eq: 'a'}]}}}}],
-    [
-      'name{first=[a {A}]}',
-      {name: {properties: {first: {eq: [{eq: 'a', properties: {A: {}}}]}}}},
-    ],
-    [
-      'name{first=[{A}]}',
-      {name: {properties: {first: {eq: [{properties: {A: {}}}]}}}},
-    ],
-    ['name=value {prop}', {name: {eq: 'value', properties: {prop: {}}}}],
-    [
-      'name.prop={prop2}',
-      {name: {properties: {prop: {properties: {prop2: {}}}}}},
-    ],
-    ['no yes -no', {yes: {}}],
-
-    // TODO interesting behavior that removing a non-existant element, or the last element,
-    // does not remove the `properties`.
-    ['x -x.y', {x: {properties: {}}}],
-    ['x={y} -x.y', {x: {properties: {}}}],
-
-    ['x={y z} -x.y', {x: {properties: {z: {}}}}],
-    ['x={y z} x {-y}', {x: {properties: {z: {}}}}],
-    ['x=1 x {xx=11}', {x: {eq: '1', properties: {xx: {eq: '11'}}}}],
-    ['x.y=xx x=1 {...}', {x: {eq: '1', properties: {y: {eq: 'xx'}}}}],
-    ['a {b c} a=1', {a: {eq: '1'}}],
-    ['a=1 a=...{b}', {a: {eq: '1', properties: {b: {}}}}],
-    [
-      'a=red { shade=dark } color=$(a) shade=$(a.shade)',
-      {
-        a: {eq: 'red', properties: {shade: {eq: 'dark'}}},
-        color: {eq: 'red', properties: {shade: {eq: 'dark'}}},
-        shade: {eq: 'dark'},
-      },
-    ],
-    ['x=.01', {x: {eq: '.01'}}],
-    ['x=-7', {x: {eq: '-7'}}],
-    ['x=7', {x: {eq: '7'}}],
-    ['x=7.0', {x: {eq: '7.0'}}],
-    ['x=.7', {x: {eq: '.7'}}],
-    ['x=.7e2', {x: {eq: '.7e2'}}],
-    ['x=7E2', {x: {eq: '7E2'}}],
-    ['`spacey name`=Zaphod', {'spacey name': {eq: 'Zaphod'}}],
-    [
-      'image { alt=hello { field=department } }',
-      {
-        image: {
-          properties: {
-            alt: {eq: 'hello', properties: {field: {eq: 'department'}}},
-          },
-        },
-      },
-    ],
-    [
-      'image image.alt=hello image.alt.field=department',
-      {
-        image: {
-          properties: {
-            alt: {eq: 'hello', properties: {field: {eq: 'department'}}},
-          },
-        },
-      },
-    ],
-    ['can remove.properties -...', {}],
-  ];
-  test.each(tagTests)('tag %s', (expression: string, expected: TagDict) => {
-    expect(expression).tagsAre(expected);
-  });
-  test.skip('unskip to debug just one of the expressions', () => {
-    const x: TagTestTuple = ['word -...', {}];
-    expect(x[0]).tagsAre(x[1]);
-  });
-  test('inherits can be over-ridden', () => {
-    const loc1 = {
-      url: 'inherit-test',
-      range: {start: {line: 1, character: 0}, end: {line: 1, character: 0}},
-    };
-    const loc2 = {
-      url: 'inherit-test',
-      range: {start: {line: 2, character: 0}, end: {line: 2, character: 0}},
-    };
-    const nestedTags = Tag.annotationToTag({
-      inherits: {notes: [{text: '## from=inherits\n', at: loc1}]},
-      notes: [{text: '## from=notes\n', at: loc2}],
-    });
-    const fromVal = nestedTags.tag.text('from');
-    expect(fromVal).toEqual('notes');
-  });
-});
-
-describe('Tag access', () => {
-  test('just text', () => {
-    const strToParse = 'a=b';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    expect(a?.text()).toEqual('b');
-  });
-  test('tag path', () => {
-    const strToParse = 'a.b.c.d.e=f';
-    const tagParse = Tag.fromTagline(strToParse, undefined);
-    expect(tagParse.log).toEqual([]);
-    const abcde = tagParse.tag.tag('a', 'b', 'c', 'd', 'e');
-    expect(abcde).toBeDefined();
-    expect(abcde?.text()).toEqual('f');
-  });
-  test('just array', () => {
-    const strToParse = 'a=[b]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    const aval = a?.array();
-    expect(aval).toBeDefined();
-    if (aval) {
-      expect(aval.length).toEqual(1);
-      expect(aval[0].text()).toEqual('b');
-    }
-  });
-  test('array as text', () => {
-    const strToParse = 'a=[b]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    expect(a?.text()).toBeUndefined();
-  });
-  test('text as array', () => {
-    const strToParse = 'a=b';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    expect(a?.array()).toBeUndefined();
-  });
-  test('just numeric', () => {
-    const strToParse = 'a=7';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const n = a?.numeric();
-    expect(typeof n).toBe('number');
-    expect(n).toEqual(7);
-  });
-  test('text as numeric', () => {
-    const strToParse = 'a=seven';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const n = a?.numeric();
-    expect(n).toBeUndefined();
-  });
-  test('array as numeric', () => {
-    const strToParse = 'a=[seven]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const n = a?.numeric();
-    expect(n).toBeUndefined();
-  });
-  test('full text array', () => {
-    const strToParse = 'a=[b,c]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const ais = a?.textArray();
-    expect(ais).toEqual(['b', 'c']);
-  });
-  test('filtered text array', () => {
-    const strToParse = 'a=[b,c,{d}]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const ais = a?.textArray();
-    expect(ais).toEqual(['b', 'c']);
-  });
-  test('full numeric array', () => {
-    const strToParse = 'a=[1,2]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const ais = a?.numericArray();
-    expect(ais).toEqual([1, 2]);
-  });
-  test('filtered numeric array', () => {
-    const strToParse = 'a=[1,2,three]';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    const a = getTags.tag.tag('a');
-    expect(a).toBeDefined();
-    const ais = a?.numericArray();
-    expect(ais).toEqual([1, 2]);
-  });
-  test('has', () => {
-    const strToParse = 'a b.d';
-    const getTags = Tag.fromTagline(strToParse, undefined);
-    expect(getTags.log).toEqual([]);
-    expect(getTags.tag.has('a')).toBeTruthy();
-    expect(getTags.tag.has('b', 'd')).toBeTruthy();
-    expect(getTags.tag.has('c')).toBeFalsy();
-  });
-});
-
 describe('## top level', () => {
   test('top level tags are available in the model def', async () => {
     const model = await runtime
@@ -495,10 +259,10 @@ describe('tags in results', () => {
     expect(field).toBeDefined();
     let tp = field.tagParse().tag;
     expect(tp).tagsAre({valueFrom: {eq: 'model'}});
-    const sessionScope = Tag.fromTagline('# scope=session', undefined).tag;
+    const sessionScope = Tag.fromTagLine('# scope=session', undefined).tag;
     tp = field.tagParse({scopes: [sessionScope]}).tag;
     expect(tp).tagsAre({valueFrom: {eq: 'session'}});
-    const globalScope = Tag.fromTagline('# scope=global', undefined).tag;
+    const globalScope = Tag.fromTagLine('# scope=global', undefined).tag;
     tp = field.tagParse({scopes: [globalScope, sessionScope]}).tag;
     expect(tp).tagsAre({valueFrom: {eq: 'global'}});
   });
@@ -512,17 +276,6 @@ describe('tags in results', () => {
     const modelTags = result.modelTag;
     expect(modelTags.text('from')).toEqual('cell2');
   });
-  test('property access on existing tag (which does not yet have properties)', () => {
-    const parsePlot = Tag.fromTagline('# plot', undefined);
-    const parsed = Tag.fromTagline('# plot.x=2', parsePlot.tag);
-    const allTags = parsed.tag;
-    const plotTag = allTags.tag('plot');
-    const xTag = plotTag!.tag('x');
-    const x = xTag!.numeric();
-    expect(parsed.tag.numeric('plot', 'x')).toEqual(2);
-    expect(plotTag!.numeric('x')).toEqual(2);
-    expect(x).toEqual(2);
-  });
   test('nested fields of same field do not share tags', async () => {
     const loaded = runtime.loadQuery(`
       source: one is duckdb.sql("SELECT 1 as one")
@@ -548,4 +301,20 @@ describe('tags in results', () => {
       });
     }
   });
+  test('inherits can be over-ridden', () => {
+    const loc1 = {
+      url: 'inherit-test',
+      range: {start: {line: 1, character: 0}, end: {line: 1, character: 0}},
+    };
+    const loc2 = {
+      url: 'inherit-test',
+      range: {start: {line: 2, character: 0}, end: {line: 2, character: 0}},
+    };
+    const nestedTags = annotationToTag({
+      inherits: {notes: [{text: '## from=inherits\n', at: loc1}]},
+      notes: [{text: '## from=notes\n', at: loc2}],
+    });
+    const fromVal = nestedTags.tag.text('from');
+    expect(fromVal).toEqual('notes');
+  });
 });

package/src/util/db-jest-matchers.ts

@@ -30,8 +30,8 @@ import {
   MalloyError,
   LogMessage,
   SingleConnectionRuntime,
-  Tag,
 } from '@malloydata/malloy';
+import {Tag} from '@malloydata/malloy-tag';
 import EventEmitter from 'events';
 import {inspect} from 'util';
 

package/tsconfig.json

@@ -35,6 +35,12 @@
     },
     {
       "path": "../packages/malloy-malloy-sql"
+    },
+    {
+      "path": "../packages/malloy-query-builder"
+    },
+    {
+      "path": "../packages/malloy-tag"
     }
   ]
 }