@malloydata/malloy-tests 0.0.130-dev240311164559 → 0.0.130-dev240311192728

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.
@@ -1,12 +1,11 @@
1
1
  /// <reference types="jest" />
2
2
  import { FilterExpression, QueryFieldDef, IndexFieldDef, Result, Runtime } from '@malloydata/malloy';
3
+ export * from '@malloydata/malloy/test';
3
4
  export declare function fToQF(fs: (QueryFieldDef | string)[]): QueryFieldDef[];
4
5
  export declare function fToIF(fs: string[]): IndexFieldDef[];
5
6
  export declare function fStringEq(field: string, value: string): FilterExpression;
6
7
  export declare function fStringLike(field: string, value: string): FilterExpression;
7
8
  export declare function fYearEq(field: string, year: number): FilterExpression;
8
- export declare function databasesFromEnvironmentOr(defaultDatabases: string[]): string[];
9
- export declare function describeIfDatabaseAvailable(acceptableDatabases: string[]): [jest.Describe, string[]];
10
9
  interface InitValues {
11
10
  sql?: string;
12
11
  malloy?: string;
@@ -14,4 +13,3 @@ interface InitValues {
14
13
  export declare function mkSqlEqWith(runtime: Runtime, cName: string, initV?: InitValues): (expr: string, result: string | boolean | number) => Promise<Result>;
15
14
  export declare function runQuery(runtime: Runtime, querySrc: string): Promise<Result>;
16
15
  export declare function onlyIf(cond: boolean, condTest: jest.ProvidesCallback): jest.ProvidesCallback;
17
- export {};
@@ -21,8 +21,23 @@
21
21
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
22
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
23
  */
24
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
25
+ if (k2 === undefined) k2 = k;
26
+ var desc = Object.getOwnPropertyDescriptor(m, k);
27
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
28
+ desc = { enumerable: true, get: function() { return m[k]; } };
29
+ }
30
+ Object.defineProperty(o, k2, desc);
31
+ }) : (function(o, m, k, k2) {
32
+ if (k2 === undefined) k2 = k;
33
+ o[k2] = m[k];
34
+ }));
35
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
36
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
37
+ };
24
38
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.onlyIf = exports.runQuery = exports.mkSqlEqWith = exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = exports.fYearEq = exports.fStringLike = exports.fStringEq = exports.fToIF = exports.fToQF = void 0;
39
+ exports.onlyIf = exports.runQuery = exports.mkSqlEqWith = exports.fYearEq = exports.fStringLike = exports.fStringEq = exports.fToIF = exports.fToQF = void 0;
40
+ __exportStar(require("@malloydata/malloy/test"), exports);
26
41
  // these two helper functions are here just to make older hand built models
27
42
  // easier to use in the new world were refs are not strings
28
43
  function fToQF(fs) {
@@ -60,31 +75,6 @@ function fYearEq(field, year) {
60
75
  };
61
76
  }
62
77
  exports.fYearEq = fYearEq;
63
- // accepts databases in env, either via comma-separated dialect list (MALLOY_DATABASES=) or a single
64
- // database (MALLOY_DATABASE=). returns either databases defined in env or a default list that was passed.
65
- function databasesFromEnvironmentOr(defaultDatabases) {
66
- return process.env['MALLOY_DATABASES']
67
- ? process.env['MALLOY_DATABASES'].split(',')
68
- : process.env['MALLOY_DATABASE']
69
- ? [process.env['MALLOY_DATABASE']]
70
- : defaultDatabases;
71
- }
72
- exports.databasesFromEnvironmentOr = databasesFromEnvironmentOr;
73
- const describeSkip = Object.assign((name, fn) => describe.skip(name, fn), {
74
- skip: describe.skip,
75
- // eslint-disable-next-line no-restricted-properties
76
- only: describe.only,
77
- each: (() => () => it.skip('skipped', () => { })),
78
- });
79
- // confirms that one or more of the databases being tested overlaps with the databases a test suite can accept.
80
- // if there is overlap, return a tuple of jest.describe and the dialects to be tested
81
- // if there is no overlap, return a tuple if jest.describe.skip and the dialects to be tested
82
- function describeIfDatabaseAvailable(acceptableDatabases) {
83
- const currentDatabases = databasesFromEnvironmentOr(acceptableDatabases);
84
- const overlap = acceptableDatabases.filter(d => currentDatabases.includes(d));
85
- return overlap.length > 0 ? [describe, overlap] : [describeSkip, overlap];
86
- }
87
- exports.describeIfDatabaseAvailable = describeIfDatabaseAvailable;
88
78
  function sqlSafe(str) {
89
79
  return str
90
80
  .replace(/'/g, '{single-quote}')
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -21,12 +21,12 @@
21
21
  },
22
22
  "dependencies": {
23
23
  "@jest/globals": "^29.4.3",
24
- "@malloydata/db-bigquery": "^0.0.130-dev240311164559",
25
- "@malloydata/db-duckdb": "^0.0.130-dev240311164559",
26
- "@malloydata/db-postgres": "^0.0.130-dev240311164559",
27
- "@malloydata/db-snowflake": "^0.0.130-dev240311164559",
28
- "@malloydata/malloy": "^0.0.130-dev240311164559",
29
- "@malloydata/render": "^0.0.130-dev240311164559",
24
+ "@malloydata/db-bigquery": "^0.0.130-dev240311192728",
25
+ "@malloydata/db-duckdb": "^0.0.130-dev240311192728",
26
+ "@malloydata/db-postgres": "^0.0.130-dev240311192728",
27
+ "@malloydata/db-snowflake": "^0.0.130-dev240311192728",
28
+ "@malloydata/malloy": "^0.0.130-dev240311192728",
29
+ "@malloydata/render": "^0.0.130-dev240311192728",
30
30
  "jsdom": "^22.1.0",
31
31
  "luxon": "^2.4.0",
32
32
  "madge": "^6.0.0"
@@ -35,5 +35,5 @@
35
35
  "@types/jsdom": "^21.1.1",
36
36
  "@types/luxon": "^2.4.0"
37
37
  },
38
- "version": "0.0.130-dev240311164559"
38
+ "version": "0.0.130-dev240311192728"
39
39
  }
package/src/util/index.ts CHANGED
@@ -30,6 +30,7 @@ import {
30
30
  Result,
31
31
  Runtime,
32
32
  } from '@malloydata/malloy';
33
+ export * from '@malloydata/malloy/test';
33
34
 
34
35
  // these two helper functions are here just to make older hand built models
35
36
  // easier to use in the new world were refs are not strings
@@ -72,43 +73,6 @@ export function fYearEq(field: string, year: number): FilterExpression {
72
73
  };
73
74
  }
74
75
 
75
- // accepts databases in env, either via comma-separated dialect list (MALLOY_DATABASES=) or a single
76
- // database (MALLOY_DATABASE=). returns either databases defined in env or a default list that was passed.
77
- export function databasesFromEnvironmentOr(
78
- defaultDatabases: string[]
79
- ): string[] {
80
- return process.env['MALLOY_DATABASES']
81
- ? process.env['MALLOY_DATABASES'].split(',')
82
- : process.env['MALLOY_DATABASE']
83
- ? [process.env['MALLOY_DATABASE']]
84
- : defaultDatabases;
85
- }
86
-
87
- const describeSkip: jest.Describe = Object.assign(
88
- (
89
- name: number | string | Function | jest.FunctionLike,
90
- fn: jest.EmptyFunction
91
- ) => describe.skip(name, fn),
92
- {
93
- skip: describe.skip,
94
- // eslint-disable-next-line no-restricted-properties
95
- only: describe.only,
96
- each: (() => () => it.skip('skipped', () => {})) as unknown as jest.Each,
97
- }
98
- );
99
-
100
- // confirms that one or more of the databases being tested overlaps with the databases a test suite can accept.
101
- // if there is overlap, return a tuple of jest.describe and the dialects to be tested
102
- // if there is no overlap, return a tuple if jest.describe.skip and the dialects to be tested
103
- export function describeIfDatabaseAvailable(
104
- acceptableDatabases: string[]
105
- ): [jest.Describe, string[]] {
106
- const currentDatabases = databasesFromEnvironmentOr(acceptableDatabases);
107
- const overlap = acceptableDatabases.filter(d => currentDatabases.includes(d));
108
-
109
- return overlap.length > 0 ? [describe, overlap] : [describeSkip, overlap];
110
- }
111
-
112
76
  interface InitValues {
113
77
  sql?: string;
114
78
  malloy?: string;
@@ -1 +0,0 @@
1
- export {};
@@ -1,38 +0,0 @@
1
- "use strict";
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.
23
- */
24
- Object.defineProperty(exports, "__esModule", { value: true });
25
- // eslint-disable-next-line no-restricted-imports
26
- const utils_1 = require("@malloydata/malloy/src/model/utils");
27
- describe('model/utils', () => {
28
- it('should generate deterministic hashes', () => {
29
- const hash1 = (0, utils_1.generateHash)('test-content');
30
- expect(hash1).toEqual('ab17568f-0362-503d-a9c6-76fb0b203636');
31
- });
32
- it('should generate unique hashes', () => {
33
- const hash1 = (0, utils_1.generateHash)('test-content');
34
- const hash2 = (0, utils_1.generateHash)('test-content-different');
35
- expect(hash1).not.toEqual(hash2);
36
- });
37
- });
38
- //# sourceMappingURL=utils.spec.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.spec.js","sourceRoot":"","sources":["../../src/model/utils.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,iDAAiD;AACjD,8DAAgE;AAEhE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,wBAAwB,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,37 +0,0 @@
1
- /*
2
- * Copyright 2023 Google LLC
3
- *
4
- * Permission is hereby granted, free of charge, to any person obtaining
5
- * a copy of this software and associated documentation files
6
- * (the "Software"), to deal in the Software without restriction,
7
- * including without limitation the rights to use, copy, modify, merge,
8
- * publish, distribute, sublicense, and/or sell copies of the Software,
9
- * and to permit persons to whom the Software is furnished to do so,
10
- * subject to the following conditions:
11
- *
12
- * The above copyright notice and this permission notice shall be
13
- * included in all copies or substantial portions of the Software.
14
- *
15
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22
- */
23
-
24
- // eslint-disable-next-line no-restricted-imports
25
- import {generateHash} from '@malloydata/malloy/src/model/utils';
26
-
27
- describe('model/utils', () => {
28
- it('should generate deterministic hashes', () => {
29
- const hash1 = generateHash('test-content');
30
- expect(hash1).toEqual('ab17568f-0362-503d-a9c6-76fb0b203636');
31
- });
32
- it('should generate unique hashes', () => {
33
- const hash1 = generateHash('test-content');
34
- const hash2 = generateHash('test-content-different');
35
- expect(hash1).not.toEqual(hash2);
36
- });
37
- });