@malloydata/malloy 0.0.373 → 0.0.374
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.
|
@@ -82,35 +82,14 @@ async function tryReadAtLevel(dirURL, urlReader) {
|
|
|
82
82
|
tryReadJSON(sharedURL, urlReader),
|
|
83
83
|
tryReadJSON(localURL, urlReader),
|
|
84
84
|
]);
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
// Shallow-merge top-level keys, local wins. `connections` is the one
|
|
89
|
-
// section we deep-merge by entry name (local winning) — the documented
|
|
90
|
-
// shop workflow is shared credentials as env refs in git, local
|
|
91
|
-
// overrides with literal values outside git.
|
|
92
|
-
//
|
|
93
|
-
// All other sections (virtualMap, manifestPath, includeDefaultConnections)
|
|
94
|
-
// are replaced wholesale when present in the local file. If you want to
|
|
95
|
-
// augment a shared virtualMap from the local file, you have to copy
|
|
96
|
-
// the shared entries into the local file explicitly.
|
|
97
|
-
const sharedConns = isRecord(sharedPOJO['connections'])
|
|
98
|
-
? sharedPOJO['connections']
|
|
99
|
-
: {};
|
|
100
|
-
const localConns = isRecord(localPOJO['connections'])
|
|
101
|
-
? localPOJO['connections']
|
|
102
|
-
: {};
|
|
103
|
-
const merged = {
|
|
104
|
-
...sharedPOJO,
|
|
105
|
-
...localPOJO,
|
|
106
|
-
connections: { ...sharedConns, ...localConns },
|
|
107
|
-
};
|
|
108
|
-
return { configURL: localURL, pojo: merged };
|
|
109
|
-
}
|
|
85
|
+
// Local supersedes shared entirely when both exist — no merging of any
|
|
86
|
+
// kind. The person writing a local file is responsible for including
|
|
87
|
+
// everything they need.
|
|
110
88
|
if (localPOJO)
|
|
111
89
|
return { configURL: localURL, pojo: localPOJO };
|
|
112
|
-
|
|
113
|
-
|
|
90
|
+
if (sharedPOJO)
|
|
91
|
+
return { configURL: sharedURL, pojo: sharedPOJO };
|
|
92
|
+
return null;
|
|
114
93
|
}
|
|
115
94
|
/**
|
|
116
95
|
* Try to read and parse a config file at `url`.
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const MALLOY_VERSION = "0.0.
|
|
1
|
+
export declare const MALLOY_VERSION = "0.0.374";
|
package/dist/version.js
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MALLOY_VERSION = void 0;
|
|
4
4
|
// generated with 'generate-version-file' script; do not edit manually
|
|
5
|
-
exports.MALLOY_VERSION = '0.0.
|
|
5
|
+
exports.MALLOY_VERSION = '0.0.374';
|
|
6
6
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@malloydata/malloy",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.374",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dist/index.js",
|
|
@@ -47,15 +47,15 @@
|
|
|
47
47
|
"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"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@malloydata/malloy-filter": "0.0.
|
|
51
|
-
"@malloydata/malloy-interfaces": "0.0.
|
|
52
|
-
"@malloydata/malloy-tag": "0.0.
|
|
50
|
+
"@malloydata/malloy-filter": "0.0.374",
|
|
51
|
+
"@malloydata/malloy-interfaces": "0.0.374",
|
|
52
|
+
"@malloydata/malloy-tag": "0.0.374",
|
|
53
53
|
"@noble/hashes": "^1.8.0",
|
|
54
54
|
"antlr4ts": "^0.5.0-alpha.4",
|
|
55
55
|
"assert": "^2.0.0",
|
|
56
56
|
"jaro-winkler": "^0.2.8",
|
|
57
57
|
"jest-diff": "^29.6.2",
|
|
58
|
-
"lodash": "^4.
|
|
58
|
+
"lodash": "^4.18.1",
|
|
59
59
|
"luxon": "^3.5.0",
|
|
60
60
|
"uuid": "^8.3.2"
|
|
61
61
|
},
|