@sqlanvil/cli 1.30.0 → 1.32.0

package/bundle.js

@@ -49559,6 +49559,7 @@ var VerifyProtoErrorBehaviour;
 })(VerifyProtoErrorBehaviour || (VerifyProtoErrorBehaviour = {}));
 const Struct = google.protobuf.Struct;
 const originalVerify = Struct.verify;
+const originalFromObject = Struct.fromObject;
 Struct.verify = function (object) {
     if (object && typeof object === "object" && !("fields" in object)) {
         const fields = {};
@@ -49570,6 +49571,17 @@ Struct.verify = function (object) {
     }
     return originalVerify.call(this, object);
 };
+Struct.fromObject = function (object) {
+    if (object && typeof object === "object" && !("fields" in object)) {
+        const fields = {};
+        for (const [k, v] of Object.entries(object)) {
+            fields[k] = unknownToValueShallow(v);
+        }
+        Object.keys(object).forEach(key => delete object[key]);
+        object.fields = fields;
+    }
+    return originalFromObject.call(this, object);
+};
 function verifyObjectMatchesProto(protoType, object, errorBehaviour = VerifyProtoErrorBehaviour.DEFAULT) {
     if (Array.isArray(object)) {
         throw ReferenceError(`Expected a top-level object, but found an array`);
@@ -49583,6 +49595,11 @@ function verifyObjectMatchesProto(protoType, object, errorBehaviour = VerifyProt
         throw ReferenceError(`Invalid property value: ${verificationError}.` +
             maybeGetDocsLinkPrefix(errorBehaviour, protoType));
     }
+    try {
+        protoType.fromObject(object);
+    }
+    catch (_a) {
+    }
     const proto = protoType.create(object);
     const protoCastObject = protoType.toObject(proto);
     function checkFields(present, desired) {
@@ -49696,8 +49713,8 @@ function unknownToValueShallow(raw) {
 
 const nativeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
 function globToRegExp(pattern) {
-    const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\\\*/g, ".*");
-    return new RegExp(`^${escaped}$`);
+    const escapeLiteral = (literal) => literal.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`^${pattern.split("*").map(escapeLiteral).join(".*")}$`);
 }
 function matchPatterns(patterns, values) {
     const fullyQualifiedActions = [];
@@ -51079,8 +51096,8 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter(validationQuery => !!validationQuery.query);
 }
 
-const version = "1.30.0";
-const dataformVersion = "3.0.64";
+const version = "1.32.0";
+const dataformVersion = "3.0.66";
 
 async function build(compiledGraph, runConfig, dbadapter) {
     const prunedGraph = prune(compiledGraph, runConfig);
@@ -57562,6 +57579,7 @@ function printExecutionGraph(executionGraph, asJson) {
     }
 }
 function printExecutedAction(executedAction, executionAction, dryRun) {
+    var _a, _b;
     const jobIds = executedAction.tasks
         .filter(task => { var _a, _b; return (_b = (_a = task.metadata) === null || _a === void 0 ? void 0 : _a.bigquery) === null || _b === void 0 ? void 0 : _b.jobId; })
         .map(task => task.metadata.bigquery.jobId);
@@ -57609,17 +57627,19 @@ function printExecutedAction(executedAction, executionAction, dryRun) {
             return;
         }
         case sqlanvil.ActionResult.ExecutionStatus.SKIPPED: {
+            const skipReason = (_b = (_a = executedAction.tasks) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.errorMessage;
+            const skipSuffix = skipReason ? ` (${skipReason})` : "";
             switch (executionAction.type) {
                 case "table": {
-                    writeStdOut(`${warningOutput("Skipping dataset creation: ")} ${datasetString(executionAction.target, executionAction.tableType, executionAction.tasks.length === 0)}`);
+                    writeStdOut(`${warningOutput("Skipping dataset creation: ")} ${datasetString(executionAction.target, executionAction.tableType, executionAction.tasks.length === 0)}${skipSuffix}`);
                     return;
                 }
                 case "assertion": {
-                    writeStdOut(`${warningOutput("Skipping assertion execution: ")} ${assertionString(executionAction.target, executionAction.tasks.length === 0)}`);
+                    writeStdOut(`${warningOutput("Skipping assertion execution: ")} ${assertionString(executionAction.target, executionAction.tasks.length === 0)}${skipSuffix}`);
                     return;
                 }
                 case "operation": {
-                    writeStdOut(`${warningOutput("Skipping operation execution: ")} ${operationString(executionAction.target, executionAction.tasks.length === 0)}`);
+                    writeStdOut(`${warningOutput("Skipping operation execution: ")} ${operationString(executionAction.target, executionAction.tasks.length === 0)}${skipSuffix}`);
                     return;
                 }
             }
@@ -57701,7 +57721,7 @@ function dotRepresentation(graph, interactive) {
     (_c = graph.operations) === null || _c === void 0 ? void 0 : _c.forEach(operation => {
         var _a;
         const nodeName = `${formatTarget(operation.target)}`;
-        nodes.push(`"${nodeName}" [label="${formatTarget(operation.target)}"`);
+        nodes.push(`"${nodeName}" [label="${formatTarget(operation.target)}"]`);
         (_a = operation.dependencyTargets) === null || _a === void 0 ? void 0 : _a.forEach(dependencyTarget => {
             edges.push(`"${formatTarget(dependencyTarget)}" -> "${nodeName}"`);
         });
@@ -59389,6 +59409,14 @@ const timeoutOption = option("timeout", {
     default: null,
     coerce: (rawTimeoutString) => rawTimeoutString ? parseDuration__default["default"](rawTimeoutString) : null
 });
+const executionTimeoutOption = option("execution-timeout", {
+    describe: "Wall-clock deadline for the entire run (compile + all actions). When it fires, " +
+        "in-flight actions are cancelled and pending actions are skipped. Off by default. " +
+        "Examples: '10m', '2h'.",
+    type: "string",
+    default: null,
+    coerce: (rawTimeoutString) => rawTimeoutString ? parseDuration__default["default"](rawTimeoutString) : null
+});
 const noArtifactsOption = option("no-artifacts", {
     describe: "Skip writing the queryable Parquet artifacts under target/ (catalog on compile; run history " +
         "on run).",
@@ -59461,6 +59489,7 @@ const verboseOptionName = "verbose";
 const dryRunOptionName = "dry-run";
 const runTestsOptionName = "run-tests";
 const checkOptionName = "check";
+const ignoreJsFilesOptionName = "ignore-js-files";
 const actionRetryLimitName = "action-retry-limit";
 function getCredentialsPath(projectDir, credentialsPath) {
     return actuallyResolve(projectDir, credentialsPath);
@@ -60024,6 +60053,7 @@ function runCli() {
                     credentialsOption,
                     jsonOutputOption,
                     timeoutOption,
+                    executionTimeoutOption,
                     tagsOption,
                     bigqueryJobLabelsOption,
                     noArtifactsOption,
@@ -60107,7 +60137,8 @@ function runCli() {
                         actions: argv[actionsOption.name],
                         includeDependencies: argv[includeDepsOption.name],
                         includeDependents: argv[includeDependentsOption.name],
-                        tags: argv[tagsOption.name]
+                        tags: argv[tagsOption.name],
+                        timeoutMillis: argv[executionTimeoutOption.name] || undefined
                     }, dbadapter);
                     if (argv[dryRunOptionName] && argv[jsonOutputOption.name]) {
                         printExecutionGraph(executionGraph, argv[jsonOutputOption.name]);
@@ -60176,6 +60207,18 @@ function runCli() {
                     runner.onChange(printExecutedGraph);
                     const runResult = await runner.result();
                     printExecutedGraph(runResult);
+                    if (!argv[jsonOutputOption.name]) {
+                        if (runResult.status === sqlanvil.RunResult.ExecutionStatus.TIMED_OUT) {
+                            const executionTimeoutMillis = argv[executionTimeoutOption.name];
+                            const suffix = executionTimeoutMillis
+                                ? ` after ${executionTimeoutMillis / 1000} seconds (--execution-timeout)`
+                                : "";
+                            printError(`Run timed out${suffix}.`);
+                        }
+                        else if (runResult.status === sqlanvil.RunResult.ExecutionStatus.CANCELLED) {
+                            printError("Run cancelled.");
+                        }
+                    }
                     if (!argv[noArtifactsOption.name]) {
                         await safeWriteArtifacts(compiledGraph, argv[projectDirOption.name], {
                             runResult,
@@ -60227,10 +60270,16 @@ function runCli() {
                         describe: "Check if files are formatted correctly without modifying them.",
                         type: "boolean",
                         default: false
+                    }),
+                    option(ignoreJsFilesOptionName, {
+                        describe: "If set, the formatter will not consider javascript files (.js).",
+                        type: "boolean",
+                        default: false
                     })
                 ],
                 processFn: async (argv) => {
-                    let actions = ["{definitions,includes}/**/*.{js,sqlx}"];
+                    const extensions = argv[ignoreJsFilesOptionName] ? "*.sqlx" : "*.{js,sqlx}";
+                    let actions = [`{definitions,includes}/**/${extensions}`];
                     if (actionsOption.name in argv && argv[actionsOption.name].length > 0) {
                         actions = argv[actionsOption.name];
                     }

package/package.json

@@ -24,7 +24,7 @@
         "tmp": "^0.2.7",
         "typeid-js": "0.3.0",
         "untildify": "^4.0.0",
-        "vm2": "3.11.4",
+        "vm2": "3.11.6",
         "yargs": "^16.2.0"
     },
     "resolutions": {
@@ -73,7 +73,7 @@
     "bin": {
         "sqlanvil": "bundle.js"
     },
-    "version": "1.30.0",
+    "version": "1.32.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -49495,6 +49495,7 @@ var VerifyProtoErrorBehaviour;
 })(VerifyProtoErrorBehaviour || (VerifyProtoErrorBehaviour = {}));
 const Struct = google.protobuf.Struct;
 const originalVerify = Struct.verify;
+const originalFromObject = Struct.fromObject;
 Struct.verify = function (object) {
     if (object && typeof object === "object" && !("fields" in object)) {
         const fields = {};
@@ -49506,6 +49507,17 @@ Struct.verify = function (object) {
     }
     return originalVerify.call(this, object);
 };
+Struct.fromObject = function (object) {
+    if (object && typeof object === "object" && !("fields" in object)) {
+        const fields = {};
+        for (const [k, v] of Object.entries(object)) {
+            fields[k] = unknownToValueShallow(v);
+        }
+        Object.keys(object).forEach(key => delete object[key]);
+        object.fields = fields;
+    }
+    return originalFromObject.call(this, object);
+};
 function encode64(protoType, value = {}) {
     return toBase64(protoType.encode(protoType.create(value)).finish());
 }