trellis 1.0.4 → 1.0.6

package/dist/cli/tql.js

@@ -16751,7 +16751,12 @@ var init_schema = __esm(() => {
             type: "string",
             description: "Output dataset name"
           },
-          source: { $ref: "#/definitions/httpSource" },
+          source: {
+            oneOf: [
+              { $ref: "#/definitions/httpSource" },
+              { $ref: "#/definitions/fileSource" }
+            ]
+          },
           from: { type: "string" },
           eqls: { type: "string" },
           output: { $ref: "#/definitions/output" }
@@ -16779,6 +16784,25 @@ var init_schema = __esm(() => {
           }
         ]
       },
+      fileSource: {
+        type: "object",
+        properties: {
+          kind: {
+            const: "file",
+            description: "Source kind"
+          },
+          path: {
+            type: "string",
+            description: "Path to local file, relative to the workflow file"
+          },
+          format: {
+            enum: ["json", "csv"],
+            description: "File format (defaults to json)"
+          }
+        },
+        required: ["kind", "path"],
+        additionalProperties: false
+      },
       httpSource: {
         type: "object",
         properties: {
@@ -46443,7 +46467,8 @@ Kernel Statistics:`));
 
 // src/workflows/engine.ts
 init_types();
-import { readFile as readFile2 } from "fs/promises";
+import { readFile as readFile3 } from "fs/promises";
+import { dirname as dirname3, resolve as resolve3 } from "path";
 
 // src/workflows/parser.ts
 init_dist();
@@ -46774,8 +46799,8 @@ function validateStepRequirements(step, availableDatasets) {
 
 // src/workflows/runners.ts
 init_types();
-import { writeFile, mkdir } from "fs/promises";
-import { dirname } from "path";
+import { writeFile, mkdir, readFile } from "fs/promises";
+import { dirname, resolve as resolve2 } from "path";
 class HttpSourceRunner {
   validate(spec2) {
     if (!spec2.url) {
@@ -46898,6 +46923,58 @@ class HttpSourceRunner {
   }
 }
 
+class FileSourceRunner {
+  validate(spec2) {
+    if (!spec2.path) {
+      throw new WorkflowRuntimeError("File source requires path");
+    }
+  }
+  async run(spec2, ctx) {
+    this.validate(spec2);
+    const filePath = resolve2(ctx.workingDir, spec2.path);
+    ctx.log({ message: `Reading file: ${filePath}` });
+    try {
+      const content = await readFile(filePath, "utf-8");
+      const format = spec2.format || "json";
+      const rows = format === "json" ? this.parseJSON(content) : this.parseCSV(content);
+      const limitedRows = ctx.dry && ctx.limit ? rows.slice(0, ctx.limit) : rows;
+      return {
+        name: "file_data",
+        rows: limitedRows
+      };
+    } catch (error45) {
+      throw new WorkflowRuntimeError(`Failed to read file ${spec2.path}: ${error45 instanceof Error ? error45.message : "Unknown error"}`);
+    }
+  }
+  parseJSON(content) {
+    const data = JSON.parse(content);
+    if (Array.isArray(data)) {
+      return data;
+    }
+    if (data.rows && Array.isArray(data.rows)) {
+      return data.rows;
+    }
+    return [data];
+  }
+  parseCSV(content) {
+    const lines = content.trim().split(`
+`);
+    if (lines.length === 0)
+      return [];
+    const headers = lines[0].split(",").map((h) => h.trim());
+    const rows = [];
+    for (let i = 1;i < lines.length; i++) {
+      const values = lines[i].split(",").map((v) => v.trim());
+      const row = {};
+      for (let j = 0;j < headers.length; j++) {
+        row[headers[j]] = values[j] || "";
+      }
+      rows.push(row);
+    }
+    return rows;
+  }
+}
+
 class QueryRunner {
   validate(spec2) {
     if (!spec2.eqls || spec2.eqls.trim().length === 0) {
@@ -46930,8 +47007,8 @@ class QueryRunner {
       if (parseResult.errors.length > 0) {
         throw new WorkflowRuntimeError(`Query parsing failed: ${parseResult.errors.map((e) => e.message).join("; ")}`);
       }
-      const results = evaluator.evaluate(parseResult.query);
-      const rows = this.resultsToRows(results);
+      const results = evaluator.evaluate(parseResult.query, parseResult.meta?.limit);
+      const rows = this.resultsToRows(results, parseResult.projectionMap);
       const limitedRows = ctx.dry && ctx.limit ? rows.slice(0, ctx.limit) : rows;
       return {
         name: spec2.out,
@@ -46941,11 +47018,18 @@ class QueryRunner {
       throw new WorkflowRuntimeError(`Query execution failed: ${error45 instanceof Error ? error45.message : "Unknown error"}`);
     }
   }
-  resultsToRows(results) {
-    if (results && results.bindings && Array.isArray(results.bindings)) {
-      return results.bindings;
+  resultsToRows(results, projectionMap) {
+    if (!results || !results.bindings || !Array.isArray(results.bindings)) {
+      return [];
     }
-    return [];
+    return results.bindings.map((binding) => {
+      const row = {};
+      for (const [key, value] of Object.entries(binding)) {
+        const cleanKey = projectionMap?.get(key) || key.replace(/^\?/, "");
+        row[cleanKey] = value;
+      }
+      return row;
+    });
   }
   resolveInputDatasets(spec2, ctx) {
     const datasets = [];
@@ -47060,6 +47144,7 @@ class OutputRunner {
 }
 var BUILTIN_RUNNERS = {
   "source:http": new HttpSourceRunner,
+  "source:file": new FileSourceRunner,
   "query:eqls": new QueryRunner,
   "output:file": new OutputRunner,
   "output:stdout": new OutputRunner
@@ -47070,6 +47155,9 @@ function getRunner(stepType, stepSpec) {
       if (stepSpec.source?.kind === "http") {
         return BUILTIN_RUNNERS["source:http"];
       }
+      if (stepSpec.source?.kind === "file") {
+        return BUILTIN_RUNNERS["source:file"];
+      }
       break;
     case "query":
       return BUILTIN_RUNNERS["query:eqls"];
@@ -47092,7 +47180,7 @@ var LOG_LEVELS = {
 
 // src/workflows/cache.ts
 import { createHash } from "crypto";
-import { readFile, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { existsSync } from "fs";
 import { dirname as dirname2, join } from "path";
 import { gzip, gunzip } from "zlib";
@@ -47111,7 +47199,7 @@ class FileCacheManager {
       if (!existsSync(filePath)) {
         return null;
       }
-      const compressed = await readFile(filePath);
+      const compressed = await readFile2(filePath);
       const decompressed = await gunzipAsync(compressed);
       const dataset = JSON.parse(decompressed.toString("utf-8"));
       return dataset;
@@ -47263,13 +47351,15 @@ class WorkflowEngine {
   runId;
   cacheManager;
   events = [];
+  workingDir = process.cwd();
   constructor(options = {}, cacheDir) {
     this.options = options;
     this.runId = `run_${Date.now()}_${Math.random().toString(36).substr(2, 6)}`;
     this.cacheManager = createCacheManager(options.cache || "write", cacheDir);
   }
   async executeWorkflowFile(filePath) {
-    const yamlContent = await readFile2(filePath, "utf-8");
+    this.workingDir = dirname3(resolve3(filePath));
+    const yamlContent = await readFile3(filePath, "utf-8");
     const spec2 = parseWorkflow(yamlContent);
     await this.executeWorkflow(spec2);
   }
@@ -47298,14 +47388,7 @@ class WorkflowEngine {
         if (!step) {
           throw new WorkflowRuntimeError(`Step not found: ${stepId}`);
         }
-        const startTime = Date.now();
         await this.executeStep(step, env2);
-        const duration3 = Date.now() - startTime;
-        const dataset = this.datasetsByStepId[stepId];
-        const count = dataset?.rows?.length || 0;
-        const cacheStatus = this.getCacheStatus(stepId);
-        const checkmark = "";
-        console.log(`${checkmark}${stepId} ${duration3}ms out=${count} cache:${cacheStatus}`);
       }
       this.logEvent("workflow", "completed", {});
     } catch (error45) {
@@ -47334,6 +47417,7 @@ class WorkflowEngine {
         dry: this.options.dry || false,
         limit: this.options.limit,
         cacheMode: this.options.cache || "write",
+        workingDir: this.workingDir,
         cache: this.cacheManager,
         getDataset: (ref) => this.resolveDataset(ref),
         getDatasetByName: (name17) => this.datasetsByName[name17],
@@ -47361,6 +47445,7 @@ class WorkflowEngine {
       }, (event) => this.logEvent(step.id, "cache", event));
       if (result && step.out) {
         const dataset = result;
+        dataset.name = step.out;
         this.datasetsByName[step.out] = dataset;
         this.datasetsByStepId[step.id] = dataset;
         this.stepOutputNames[step.id] = step.out;
@@ -47429,8 +47514,8 @@ class WorkflowEngine {
           console.log(`${LOG_LEVELS.DONE} [${timestamp}] Workflow completed`);
         } else {
           const duration4 = event.durationMs ? `${event.durationMs}ms` : "";
-          const inputRows = event.inputRows ? `${event.inputRows} in` : "";
-          const outputRows = event.outputRows ? `${event.outputRows} out` : "";
+          const inputRows = event.inputRows !== undefined ? `${event.inputRows} in` : "";
+          const outputRows = event.outputRows !== undefined ? `${event.outputRows} out` : "";
           const cache = event.cache ? `(${event.cache})` : "";
           const cacheKey = event.cacheKey ? `[${event.cacheKey.slice(0, 8)}]` : "";
           const details = [duration4, inputRows, outputRows, cache, cacheKey].filter(Boolean).join(", ");
@@ -47805,10 +47890,10 @@ workflowCommand.command("plan <file>").description("Show execution plan for a wo
         vars[key] = valueParts.join("=");
       }
     }
-    const { readFile: readFile3 } = await import("fs/promises");
+    const { readFile: readFile4 } = await import("fs/promises");
     const { parseWorkflow: parseWorkflow3 } = await Promise.resolve().then(() => (init_parser(), exports_parser));
     const { createExecutionPlan: createExecutionPlan3 } = await Promise.resolve().then(() => (init_planner(), exports_planner));
-    const yamlContent = await readFile3(file2, "utf-8");
+    const yamlContent = await readFile4(file2, "utf-8");
     const spec2 = parseWorkflow3(yamlContent);
     const plan = createExecutionPlan3(spec2);
     if (options.dot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trellis",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Graph database and query engine for Node.js — EAV-based Datalog with natural language support",
   "main": "./dist/index.js",
   "module": "./dist/index.js",