Add a new "fileset" resource type that represents a collection of files stored as a relpath→content map. This enables resource types to manage multiple files (e.g., config directories, template sets) instead of just a single file. Backend: - Add is_fileset column to resource_type table - Update CRUD operations and workspace duplication to handle is_fileset - Add integration tests for fileset resource types Frontend: - Add FilesetEditor component with file explorer + Monaco editor - Extract shared FileExplorer component from RawAppSidebar (dedup) - Add fileset toggle to EditableSchemaWrapper - Show fileset editor in ResourceEditor and ApiConnectForm - Show folder icon for fileset resource types in IconedResourceType CLI: - Support fileset resources in sync pull (expand to .fileset/ directory) - Support fileset resources in sync push (reconstruct from directory) - Handle !inline_fileset YAML tag in resource resolution Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
251 lines
7.6 KiB
TypeScript
251 lines
7.6 KiB
TypeScript
import { stat, writeFile, readdir, readFile } from "node:fs/promises";
|
|
import { stringify as yamlStringify } from "yaml";
|
|
import nodePath from "node:path";
|
|
|
|
import {
|
|
GlobalOptions,
|
|
isSuperset,
|
|
parseFromFile,
|
|
removeType,
|
|
} from "../../types.ts";
|
|
import { requireLogin } from "../../core/auth.ts";
|
|
import { resolveWorkspace, validatePath } from "../../core/context.ts";
|
|
import { Command } from "@cliffy/command";
|
|
import { Table } from "@cliffy/table";
|
|
import { colors } from "@cliffy/ansi/colors";
|
|
import * as log from "../../core/log.ts";
|
|
import { sep as SEP } from "node:path";
|
|
import * as wmill from "../../../gen/services.gen.ts";
|
|
import { Resource } from "../../../gen/types.gen.ts";
|
|
import { readInlinePathSync } from "../../utils/utils.ts";
|
|
import { isBranchSpecificFile } from "../../core/specific_items.ts";
|
|
import { getCurrentGitBranch } from "../../utils/git.ts";
|
|
|
|
export interface ResourceFile {
|
|
value: any;
|
|
description?: string;
|
|
resource_type: string;
|
|
is_oauth?: boolean; // deprecated
|
|
}
|
|
|
|
async function readFilesetDirectory(dirPath: string): Promise<Record<string, string>> {
|
|
const result: Record<string, string> = {};
|
|
async function walk(currentPath: string, prefix: string) {
|
|
const entries = await readdir(currentPath, { withFileTypes: true });
|
|
for (const entry of entries) {
|
|
const entryPath = nodePath.join(currentPath, entry.name);
|
|
const relPath = prefix ? prefix + "/" + entry.name : entry.name;
|
|
if (entry.isDirectory()) {
|
|
await walk(entryPath, relPath);
|
|
} else if (entry.isFile()) {
|
|
result[relPath] = await readFile(entryPath, "utf-8");
|
|
}
|
|
}
|
|
}
|
|
await walk(dirPath, "");
|
|
return result;
|
|
}
|
|
|
|
export async function pushResource(
|
|
workspace: string,
|
|
remotePath: string,
|
|
resource: ResourceFile | Resource | undefined,
|
|
localResource: ResourceFile,
|
|
originalLocalPath?: string
|
|
): Promise<void> {
|
|
remotePath = removeType(remotePath, "resource");
|
|
try {
|
|
resource = await wmill.getResource({
|
|
workspace: workspace,
|
|
path: remotePath.replaceAll(SEP, "/"),
|
|
});
|
|
} catch {
|
|
// flow doesn't exist
|
|
}
|
|
|
|
// Helper function to resolve inline content
|
|
const resolveInlineContent = async () => {
|
|
if (typeof localResource.value === "string" && localResource.value.startsWith("!inline_fileset ")) {
|
|
const dirPath = localResource.value.split(" ")[1];
|
|
localResource.value = await readFilesetDirectory(dirPath.replaceAll("/", SEP));
|
|
} else if (localResource.value["content"]?.startsWith("!inline ")) {
|
|
const basePath = localResource.value["content"].split(" ")[1];
|
|
|
|
// If we're processing a branch-specific metadata file, read from branch-specific resource file
|
|
|
|
let pathToRead = basePath;
|
|
|
|
if (originalLocalPath && isBranchSpecificFile(originalLocalPath)) {
|
|
const currentBranch = getCurrentGitBranch();
|
|
if (currentBranch) {
|
|
// Directly construct branch-specific resource file path
|
|
const resourcePathSegments = basePath.split(".");
|
|
if (resourcePathSegments.length >= 4 && resourcePathSegments[resourcePathSegments.length - 3] === "resource" && resourcePathSegments[resourcePathSegments.length - 2] === "file") {
|
|
const fileBaseParts = resourcePathSegments.slice(0, -3);
|
|
const fileExt = resourcePathSegments.slice(-3);
|
|
pathToRead = [...fileBaseParts, currentBranch, ...fileExt].join(".");
|
|
}
|
|
}
|
|
}
|
|
|
|
localResource.value["content"] = readInlinePathSync(pathToRead);
|
|
}
|
|
};
|
|
|
|
if (resource) {
|
|
if (isSuperset(localResource, resource)) {
|
|
return;
|
|
}
|
|
|
|
// Only resolve inline content if we're actually updating
|
|
await resolveInlineContent();
|
|
|
|
await wmill.updateResource({
|
|
workspace: workspace,
|
|
path: remotePath.replaceAll(SEP, "/"),
|
|
requestBody: { ...localResource },
|
|
});
|
|
} else {
|
|
// New resource - resolve inline content
|
|
await resolveInlineContent();
|
|
|
|
if (localResource.is_oauth) {
|
|
log.info(
|
|
colors.yellow(
|
|
"! is_oauth has been removed in newer versions. Ignoring."
|
|
)
|
|
);
|
|
}
|
|
|
|
log.info(colors.yellow.bold("Creating new resource..."));
|
|
await wmill.createResource({
|
|
workspace: workspace,
|
|
requestBody: {
|
|
path: remotePath.replaceAll(SEP, "/"),
|
|
...localResource,
|
|
},
|
|
});
|
|
}
|
|
}
|
|
|
|
type PushOptions = GlobalOptions;
|
|
async function push(opts: PushOptions, filePath: string, remotePath: string) {
|
|
const workspace = await resolveWorkspace(opts);
|
|
await requireLogin(opts);
|
|
|
|
if (!validatePath(remotePath)) {
|
|
return;
|
|
}
|
|
|
|
const fstat = await stat(filePath);
|
|
if (!fstat.isFile()) {
|
|
throw new Error("file path must refer to a file.");
|
|
}
|
|
|
|
log.info(colors.bold.yellow("Pushing resource..."));
|
|
|
|
await pushResource(
|
|
workspace.workspaceId,
|
|
remotePath,
|
|
undefined,
|
|
parseFromFile(filePath),
|
|
filePath // Pass the local file path for branch-specific inline content resolution
|
|
);
|
|
log.info(colors.bold.underline.green(`Resource ${remotePath} pushed`));
|
|
}
|
|
|
|
async function list(opts: GlobalOptions & { json?: boolean }) {
|
|
const workspace = await resolveWorkspace(opts);
|
|
await requireLogin(opts);
|
|
let page = 0;
|
|
const perPage = 10;
|
|
const total: Resource[] = [];
|
|
while (true) {
|
|
const res = await wmill.listResource({
|
|
workspace: workspace.workspaceId,
|
|
page,
|
|
perPage,
|
|
});
|
|
total.push(...res);
|
|
page += 1;
|
|
if (res.length < perPage) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (opts.json) {
|
|
console.log(JSON.stringify(total));
|
|
} else {
|
|
new Table()
|
|
.header(["Path", "Resource Type"])
|
|
.padding(2)
|
|
.border(true)
|
|
.body(total.map((x) => [x.path, x.resource_type]))
|
|
.render();
|
|
}
|
|
}
|
|
|
|
async function newResource(opts: GlobalOptions, path: string) {
|
|
if (!validatePath(path)) {
|
|
return;
|
|
}
|
|
const filePath = path + ".resource.yaml";
|
|
try {
|
|
await stat(filePath);
|
|
throw new Error("File already exists: " + filePath);
|
|
} catch (e: any) {
|
|
if (e.message?.startsWith("File already exists")) throw e;
|
|
// file doesn't exist, proceed
|
|
}
|
|
const template: ResourceFile = {
|
|
value: {},
|
|
resource_type: "",
|
|
description: "",
|
|
};
|
|
await writeFile(filePath, yamlStringify(template as Record<string, any>), {
|
|
flag: "wx",
|
|
encoding: "utf-8",
|
|
});
|
|
log.info(colors.green(`Created ${filePath}`));
|
|
}
|
|
|
|
async function get(opts: GlobalOptions & { json?: boolean }, path: string) {
|
|
const workspace = await resolveWorkspace(opts);
|
|
await requireLogin(opts);
|
|
const r = await wmill.getResource({
|
|
workspace: workspace.workspaceId,
|
|
path,
|
|
});
|
|
if (opts.json) {
|
|
console.log(JSON.stringify(r));
|
|
} else {
|
|
console.log(colors.bold("Path:") + " " + r.path);
|
|
console.log(colors.bold("Resource Type:") + " " + (r.resource_type ?? ""));
|
|
console.log(colors.bold("Description:") + " " + (r.description ?? ""));
|
|
console.log(colors.bold("Value:") + " " + JSON.stringify(r.value, null, 2));
|
|
}
|
|
}
|
|
|
|
const command = new Command()
|
|
.description("resource related commands")
|
|
.option("--json", "Output as JSON (for piping to jq)")
|
|
.action(list as any)
|
|
.command("list", "list all resources")
|
|
.option("--json", "Output as JSON (for piping to jq)")
|
|
.action(list as any)
|
|
.command("get", "get a resource's details")
|
|
.arguments("<path:string>")
|
|
.option("--json", "Output as JSON (for piping to jq)")
|
|
.action(get as any)
|
|
.command("new", "create a new resource locally")
|
|
.arguments("<path:string>")
|
|
.action(newResource as any)
|
|
.command(
|
|
"push",
|
|
"push a local resource spec. This overrides any remote versions."
|
|
)
|
|
.arguments("<file_path:string> <remote_path:string>")
|
|
.action(push as any);
|
|
|
|
export default command;
|