@hypequery/protocol 0.2.0 → 0.2.1

package/dist/deployments/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/deployments/validate.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAEV,uBAAuB,EASvB,0BAA0B,EAE1B,yBAAyB,EAK1B,MAAM,YAAY,CAAC;AA6epB,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,uBAAuB,CAEzB;AAmKD,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,0BAA0B,CAgC5B"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/deployments/validate.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAEV,uBAAuB,EASvB,0BAA0B,EAE1B,yBAAyB,EAK1B,MAAM,YAAY,CAAC;AAsfpB,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,uBAAuB,CAEzB;AAoKD,wBAAgB,kCAAkC,CAChD,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,0BAA0B,CAgC5B"}

package/dist/deployments/validate.js

@@ -333,6 +333,15 @@ function validateMetric(input, path, limits) {
     if ((value.kind === 'grained-metric') !== (value.grain !== undefined)) {
         deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.grain`);
     }
+    const grain = value.grain === undefined
+        ? undefined
+        : parseGrain(value.grain, `${path}.grain`);
+    if (grain !== undefined && grains.length === 0) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.grains`);
+    }
+    if (grain !== undefined && !grains.includes(grain)) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.grain`);
+    }
     const result = {
         name: identifier(value.name, `${path}.name`),
         kind: value.kind,
@@ -342,8 +351,8 @@ function validateMetric(input, path, limits) {
         grains,
         endpoint: validateEndpoint(value.endpoint, `${path}.endpoint`, limits),
     };
-    if (value.grain !== undefined)
-        result.grain = parseGrain(value.grain, `${path}.grain`);
+    if (grain !== undefined)
+        result.grain = grain;
     optionalText(value.label, 'label', result, path, limits);
     optionalText(value.description, 'description', result, path, limits);
     return freezeRecord(result);
@@ -440,7 +449,8 @@ function validateReferences(contract) {
                 || metric.filters.some(filter => !filters.has(filter))) {
                 deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `$.datasets[${datasetIndex}].metrics[${metricIndex}]`);
             }
-            if (metric.grains.length > 0 && dataset.timeField === undefined) {
+            if ((metric.kind === 'grained-metric' || metric.grains.length > 0)
+                && dataset.timeField === undefined) {
                 deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `$.datasets[${datasetIndex}].metrics[${metricIndex}].grains`);
             }
             if (dataset.tenant.kind === 'required' && metric.endpoint.tenant.kind !== 'required') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/protocol",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Public contracts and TypeScript reference implementation for portable Hypequery artifacts",
   "license": "Apache-2.0",
   "type": "module",