@shivaedev/work-fleet 0.1.1 → 0.2.0

package/dist/storage/recordValue.js

@@ -1,39 +1,49 @@
-import { Effect, Result, Schema } from "effect";
-const decodeJson = Schema.decodeUnknownResult(Schema.fromJsonString(Schema.Unknown));
-function jsonValue(value) {
-    try {
-        return typeof value === "string" ? Result.succeed(JSON.parse(value)) : decodeJson(value);
+import { Effect } from "effect";
+import { SqlClient } from "effect/sql";
+import { childTable, objectValue } from "#storage/recordChildren.ts";
+import { collections } from "#storage/recordShape.ts";
+export const recordValues = Effect.fn("FleetRow.recordValues")(function* (rows, shape, namespace) {
+    const sql = yield* SqlClient.SqlClient;
+    const roots = rows.map(objectValue);
+    const children = new Map();
+    if (roots.length === 0) {
+        return [];
     }
-    catch {
-        return decodeJson(value);
+    for (const collection of collections(shape)) {
+        const parent = collection.parents.at(-1);
+        const sources = parent === undefined ? roots : (children.get(parent) ?? []);
+        const offset = parent === undefined ? 0 : parent.split(".").length;
+        const marker = collection.path.slice(offset).join("__");
+        const workIds = [...new Set(sources.filter((row) => row[marker] !== null && row[marker] !== undefined).map((row) => row.work_id))];
+        if (workIds.length === 0) {
+            continue;
+        }
+        const found = yield* sql `select * from ${sql(childTable(namespace, collection.path))} where ${sql.in("work_id", workIds)} order by ${sql.csv(Array.from({ length: collection.parents.length + 1 }, (_unused, index) => sql `${sql(`position${index}`)}`))}`;
+        children.set(collection.path.join("."), found);
     }
-}
-export const recordValues = Effect.fn("FleetRow.recordValues")(function* (rows, columns) {
-    const entries = Object.entries(columns);
-    const records = [];
-    for (const row of rows) {
-        const values = { ...row };
-        const fields = { workId: values.work_id };
-        for (const [name, kind] of entries) {
-            const value = values[name];
-            if (value === null || value === undefined) {
-                continue;
-            }
-            if (kind !== "json") {
-                fields[name] = value;
-                continue;
-            }
-            const decoded = jsonValue(value);
-            if (decoded._tag === "Failure") {
-                return yield* Effect.fail(decoded.failure);
-            }
-            fields[name] = decoded.success;
+    function read(node, row, path, prefix, indices) {
+        const name = prefix.join("__");
+        if (typeof node === "string") {
+            return row[name] ?? undefined;
+        }
+        if (prefix.length > 0 && (row[name] === null || row[name] === undefined)) {
+            return undefined;
+        }
+        if ("fields" in node) {
+            return Object.fromEntries(Object.entries(node.fields)
+                .map(([key, field]) => [key, read(field, row, [...path, key], [...prefix, key], indices)])
+                .filter(([_key, value]) => value !== undefined));
+        }
+        if (typeof node.array === "string") {
+            return row[name];
         }
-        records.push(fields);
+        return (children.get(path.join(".")) ?? [])
+            .filter((child) => child.work_id === row.work_id && indices.every((position, index) => child[`position${index}`] === position))
+            .map((child) => read(node.array, child, path, [], [...indices, Number(child[`position${indices.length}`])]));
     }
-    return records;
+    return roots.map((row) => ({ ...objectValue(read(shape, row, [], [], [])), workId: row.work_id }));
 });
-export function recordValue(row, columns) {
-    return recordValues([row], columns).pipe(Effect.map(([value]) => value));
+export function recordValue(row, shape, namespace) {
+    return recordValues([row], shape, namespace).pipe(Effect.map(([value]) => value));
 }
 //# sourceMappingURL=recordValue.js.map

package/dist/storage/recordValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"recordValue.js","sourceRoot":"","sources":["../../src/storage/recordValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhD,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAErF,SAAS,SAAS,CAAC,KAAc;IAChC,IAAI,CAAC;QACJ,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;AACF,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAuB,EAAE,OAAyC;IAC3I,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,OAAO,GAA8B,EAAE,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,MAAM,GAA4B,EAAE,GAAG,GAAG,EAAE,CAAC;QACnD,MAAM,MAAM,GAA4B,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QACnE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,OAAO,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC3C,SAAS;YACV,CAAC;YACD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACrB,SAAS;YACV,CAAC;YACD,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACjC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAChC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,OAAyC;IACjF,OAAO,YAAY,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"recordValue.js","sourceRoot":"","sources":["../../src/storage/recordValue.ts"],"names":[],"mappings":"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"}