Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for write row #23

Merged
merged 1 commit into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export async function action(options: CSVRunOptions ) {
for ( const entityChange of EntityChanges.parse(data).entityChanges ) {
const writer = writers.get(entityChange.entity);
const table = tables.get(entityChange.entity);
if ( !writer || !table ) throw new Error(`Table not found: ${entityChange.entity}`);
if ( !writer || !table ) continue; // skip if table not found
const values = getValuesInEntityChange(entityChange);
applyReservedFields(values, entityChange, cursor, clock);

Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.2.10",
"version": "0.2.11",
"name": "substreams-sink-csv",
"description": "Substreams Sink CSV",
"type": "module",
Expand All @@ -24,7 +24,7 @@
"prepublishOnly": "tsc"
},
"dependencies": {
"@substreams/sink-entity-changes": "^0.3.9",
"@substreams/sink-entity-changes": "^0.3.11",
"log-update": "latest",
"substreams-sink": "^0.16.0"
},
Expand Down
23 changes: 23 additions & 0 deletions schema.example.blobs.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
CREATE TABLE Blob
(
id TEXT,
slot TEXT,
index TEXT,
blob TEXT,
kzg_commitment TEXT,
kzg_proof TEXT,
kzg_commitment_inclusion_proof TEXT[],
);

CREATE TABLE Slot
(
id TEXT,
number BIGINT,
spec TEXT,
proposer_index INT,
parent_root TEXT,
state_root TEXT,
body_root TEXT,
signature TEXT,
timestamp TEXT,
);
File renamed without changes.
2 changes: 1 addition & 1 deletion src/getModuleHash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function getModuleHash(options: CSVRunOptions) {
for ( const module of substreamPackage.modules.modules ) {
if ( module.name === options.moduleName ) {
if ( !module.output ) throw new Error("Module has no output");
if ( module.output.type !== "proto:sf.substreams.sink.entity.v1.EntityChanges" ) throw new Error("Module output is not EntityChanges");
if ( !module.output.type.includes("entity.v1.EntityChanges") ) throw new Error("Module output is not EntityChanges");
valid = true;
}
}
Expand Down
10 changes: 9 additions & 1 deletion src/writeRow.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@ import { formatValue } from "./writeRow.js";

test("formatValue", () => {
const options = {delimiter: ","};
// expect(formatValue("a", options)).toBe("a");
expect(formatValue("a", options)).toBe("a");
expect(formatValue("'a'", options)).toBe("'a'");
expect(formatValue("foo bar", options)).toBe("foo bar");
expect(formatValue("foo \" bar", options)).toBe("foo \"\" bar");
expect(formatValue(undefined, options)).toBe("");
expect(formatValue(null, options)).toBe("");
expect(formatValue("0", options)).toBe("0");
expect(formatValue("a,b", options)).toBe("\"a,b\"");
expect(formatValue("a,\"b", options)).toBe("\"a,\"\"b\"");

// Array
expect(formatValue(["ab", "cd"], options)).toBe("\"[\"\"ab\"\",\"\"cd\"\"]\"");
})

test.skip("formatValue - recursive array", () => {
// https://github.com/substreams-js/substreams-sink-entity-changes/issues/5
});
6 changes: 5 additions & 1 deletion src/writeRow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ export function writeRow(writer: fs.WriteStream, columns: any[], options: WriteR
writer.write(columns.join(options.delimiter) + '\n');
}

export function formatValue(value: string|undefined|null, options: WriteRowOptions): string {
export function formatValue(value: string|undefined|null|object, options: WriteRowOptions): string {
if (value === undefined || value === null) return "";

if (typeof value == "object") {
value = JSON.stringify(value);
}

if (typeof value == "string") {
value = value.replace(/"/g, "\"\"")
if ( value.includes(options.delimiter) ) value = `"${value}"`; // escape commas
Expand Down
2 changes: 1 addition & 1 deletion version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const version = "0.2.10";
export const version = "0.2.11";
Loading