rastack 0.0.16 → 0.0.19

package/src/entity-generation/imports.ts

@@ -1,110 +1,110 @@
-export function removeDuplicateImports(importStatements: string): string {
-  const importLines = importStatements.split("\n");
-  const uniqueImports = new Set<string>();
-  const radStackImports = new Set<string>();
-  const radSyncImports = new Set<string>();
-  const schemaImports = new Set<string>();
-
-  importLines.forEach((line) => {
-    if (line.includes("rastack/sync")) {
-      const imports =
-        line
-          .match(/\{([^}]+)\}/)?.[1]
-          .split(",")
-          .map((s) => s.trim()) || [];
-      imports.forEach((imp) => radSyncImports.add(imp));
-    } else if (line.includes("rastack/hooks")) {
-      const imports =
-        line
-          .match(/\{([^}]+)\}/)?.[1]
-          .split(",")
-          .map((s) => s.trim()) || [];
-      imports.forEach((imp) => radStackImports.add(imp));
-    } else if (line.includes("@repo/schema/schema")) {
-      const imports =
-        line
-          .match(/\{([^}]+)\}/)?.[1]
-          .split(",")
-          .map((s) => s.trim()) || [];
-      imports.forEach((imp) => schemaImports.add(imp));
-    } else {
-      uniqueImports.add(line);
-    }
-  });
-
-  let result = Array.from(uniqueImports).join("\n") + "\n";
-
-  if (radStackImports.size > 0) {
-    result += `import { ${Array.from(radStackImports).join(", ")} } from 'rastack/hooks';\n`;
-  }
-
-  if (radSyncImports.size > 0) {
-    result += `import { ${Array.from(radSyncImports).join(", ")} } from 'rastack/sync';\n`;
-  }
-
-  if (schemaImports.size > 0) {
-    result += `import { ${Array.from(schemaImports).join(", ")} } from '@repo/schema/schema';\n`;
-  }
-
-  return result;
-}
-
-export function generateImportStatements(
-  importStatements: Set<string>,
-  modelName: string,
-): string {
-  const entries = Array.from(importStatements);
-  const syncImports = entries
-    .filter((importStatement) => importStatement.startsWith("sync:"))
-    .map((importStatement) => importStatement.slice("sync:".length))
-    .join(", ");
-  const queryImports = entries
-    .filter(
-      (importStatement) =>
-        !importStatement.startsWith("sync:") && importStatement.includes("use"),
-    )
-    .join(", ");
-  const schemaImports = entries
-    .filter(
-      (importStatement) =>
-        importStatement.startsWith("I") || importStatement.startsWith("Deref"),
-    )
-    .join(", ");
-
-  let importData =
-    "import { useForm, FormProps, FormUpdate, useUpdateQuery } from 'rastack/hooks';\n";
-  importData = importData + 'import { useAuth0 } from "@auth0/auth0-react";\n';
-  if (queryImports) {
-    importData += `import { ${queryImports} } from 'rastack/hooks';\n`;
-  }
-  if (syncImports) {
-    importData += `import { ${syncImports} } from 'rastack/sync';\n`;
-  }
-  if (schemaImports) {
-    importData += `import { ${schemaImports} } from '@repo/schema/schema';\n`;
-  }
-
-  return removeDuplicateImports(importData);
-}
-
-export function generateKeyImports(model: string, operations: string[]) {
-  model = model.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
-  let keyData = `export const ${model}QueriesKeys = {\n`;
-  operations.forEach((item) => {
-    const snakeCase = item.replace(/([A-Z])/g, "-$1").toLowerCase();
-    keyData += `     ${item}: "${snakeCase}",\n`;
-  });
-  return `${keyData}}`;
-}
-
-export function generateIndexImports(model: string, operations: string[]) {
-  return `export * from "./api"`;
-}
-
-export function generateFolderImports(models: string[]) {
-  let importData = "";
-  models.map((model) => {
-    importData += `export * from "./${model}"\n`;
-  });
-  return importData;
-}
+export function removeDuplicateImports(importStatements: string): string {
+  const importLines = importStatements.split("\n");
+  const uniqueImports = new Set<string>();
+  const radStackImports = new Set<string>();
+  const radSyncImports = new Set<string>();
+  const schemaImports = new Set<string>();
+
+  importLines.forEach((line) => {
+    if (line.includes("rastack/sync")) {
+      const imports =
+        line
+          .match(/\{([^}]+)\}/)?.[1]
+          .split(",")
+          .map((s) => s.trim()) || [];
+      imports.forEach((imp) => radSyncImports.add(imp));
+    } else if (line.includes("rastack/hooks")) {
+      const imports =
+        line
+          .match(/\{([^}]+)\}/)?.[1]
+          .split(",")
+          .map((s) => s.trim()) || [];
+      imports.forEach((imp) => radStackImports.add(imp));
+    } else if (line.includes("@repo/schema/schema")) {
+      const imports =
+        line
+          .match(/\{([^}]+)\}/)?.[1]
+          .split(",")
+          .map((s) => s.trim()) || [];
+      imports.forEach((imp) => schemaImports.add(imp));
+    } else {
+      uniqueImports.add(line);
+    }
+  });
+
+  let result = Array.from(uniqueImports).join("\n") + "\n";
+
+  if (radStackImports.size > 0) {
+    result += `import { ${Array.from(radStackImports).join(", ")} } from 'rastack/hooks';\n`;
+  }
+
+  if (radSyncImports.size > 0) {
+    result += `import { ${Array.from(radSyncImports).join(", ")} } from 'rastack/sync';\n`;
+  }
+
+  if (schemaImports.size > 0) {
+    result += `import { ${Array.from(schemaImports).join(", ")} } from '@repo/schema/schema';\n`;
+  }
+
+  return result;
+}
+
+export function generateImportStatements(
+  importStatements: Set<string>,
+  modelName: string,
+): string {
+  const entries = Array.from(importStatements);
+  const syncImports = entries
+    .filter((importStatement) => importStatement.startsWith("sync:"))
+    .map((importStatement) => importStatement.slice("sync:".length))
+    .join(", ");
+  const queryImports = entries
+    .filter(
+      (importStatement) =>
+        !importStatement.startsWith("sync:") && importStatement.includes("use"),
+    )
+    .join(", ");
+  const schemaImports = entries
+    .filter(
+      (importStatement) =>
+        importStatement.startsWith("I") || importStatement.startsWith("Deref"),
+    )
+    .join(", ");
+
+  let importData =
+    "import { useForm, FormProps, FormUpdate, useUpdateQuery } from 'rastack/hooks';\n";
+  importData = importData + 'import { useAuth0 } from "@auth0/auth0-react";\n';
+  if (queryImports) {
+    importData += `import { ${queryImports} } from 'rastack/hooks';\n`;
+  }
+  if (syncImports) {
+    importData += `import { ${syncImports} } from 'rastack/sync';\n`;
+  }
+  if (schemaImports) {
+    importData += `import { ${schemaImports} } from '@repo/schema/schema';\n`;
+  }
+
+  return removeDuplicateImports(importData);
+}
+
+export function generateKeyImports(model: string, operations: string[]) {
+  model = model.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+  let keyData = `export const ${model}QueriesKeys = {\n`;
+  operations.forEach((item) => {
+    const snakeCase = item.replace(/([A-Z])/g, "-$1").toLowerCase();
+    keyData += `     ${item}: "${snakeCase}",\n`;
+  });
+  return `${keyData}}`;
+}
+
+export function generateIndexImports(model: string, operations: string[]) {
+  return `export * from "./api"`;
+}
+
+export function generateFolderImports(models: string[]) {
+  let importData = "";
+  models.map((model) => {
+    importData += `export * from "./${model}"\n`;
+  });
+  return importData;
+}

package/src/entity-generation/sync-method.ts

@@ -1,222 +1,222 @@
-import { capitaliseFirstLetter } from "../schema/capitalise-first-letter";
-import { toCamelCase } from "../schema/to-camel-case";
-
-/**
- * Generators for sync-mode entities (operations carrying the
- * `x-rastack-sync` OpenAPI extension emitted by rastack). Reads bind to the
- * local store, writes enqueue optimistic transactions, and operations the
- * fat class marked as confirmed become blocking online-only mutations.
- *
- * Imports prefixed with "sync:" are routed to 'rastack/sync' by
- * generateImportStatements.
- */
-
-export interface EntitySyncMeta {
-  sync: boolean;
-  /** Sync.load = "lazy": excluded from initial bootstrap, loaded on first use. */
-  lazy?: boolean;
-  /** Sync.client_ids = True: rows use client-generated UUID primary keys. */
-  clientIds?: boolean;
-  confirmedOperationIds: Set<string>;
-  listUrl?: string;
-  detailUrl?: string;
-  detailParam?: string;
-  listOperationId?: string;
-  detailOperationId?: string;
-  rowSchema?: string; // e.g. "IPet"
-}
-
-export function entityConstName(model: string): string {
-  return `${toCamelCase(model)}Entity`;
-}
-
-export function generateEntityDescriptor(
-  appName: string,
-  modelName: string,
-  meta: EntitySyncMeta,
-): [string, Set<string>] {
-  const importStatements = new Set<string>();
-  importStatements.add("sync:defineEntity");
-  if (meta.rowSchema) {
-    importStatements.add(meta.rowSchema);
-  }
-  const rowType = meta.rowSchema || "any";
-  const listUrl =
-    meta.listUrl ||
-    (meta.detailUrl ? meta.detailUrl.replace(/\/?\{[^}]+\}.*$/, "") : "");
-  const detailUrl = meta.detailUrl
-    ? meta.detailUrl.replace(/\{[^}]+\}/, "${id}")
-    : `${listUrl.replace(/\/$/, "")}/\${id}`;
-
-  const lazyLine = meta.lazy ? `\n  lazy: true,` : "";
-  const clientIdsLine = meta.clientIds ? `\n  clientIds: true,` : "";
-
-  return [
-    `
-export const ${entityConstName(modelName)} = defineEntity<${rowType}>({
-  app: "${appName}",
-  model: "${modelName}",
-  listUrl: \`${listUrl}\`,
-  detailUrl: (id) => \`${detailUrl}\`,${lazyLine}${clientIdsLine}
-});
-`,
-    importStatements,
-  ];
-}
-
-export function generateSyncListMethod(
-  modelName: string,
-  operationId: string,
-  rowSchema: string | undefined,
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const rowType = rowSchema || "any";
-  const importStatements = new Set<string>();
-  importStatements.add("sync:useEntityList");
-  importStatements.add("sync:EntityListOptions");
-  if (rowSchema) {
-    importStatements.add(rowSchema);
-  }
-  return [
-    `
-export function use${operationIdUpper}(
-  options?: EntityListOptions<${rowType}>
-) {
-  return useEntityList<${rowType}>(${entityConstName(modelName)}, options);
-}`,
-    importStatements,
-  ];
-}
-
-export function generateSyncRecordMethod(
-  modelName: string,
-  operationId: string,
-  rowSchema: string | undefined,
-  pathParameters: string[],
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const rowType = rowSchema || "any";
-  const paramNames = `I${operationIdUpper}Params`;
-  const idParam = pathParameters[0];
-  const importStatements = new Set<string>();
-  importStatements.add("sync:useEntityRecord");
-  importStatements.add(`GetQueryOptions, useGetQuery`);
-  importStatements.add(paramNames);
-  if (rowSchema) {
-    importStatements.add(rowSchema);
-  }
-  return [
-    `
-export function use${operationIdUpper}(
-  options?: GetQueryOptions<${paramNames}>
-) {
-  const id = options?.params?.${idParam};
-  return useEntityRecord<${rowType}>(${entityConstName(modelName)}, id as string | number | undefined);
-}`,
-    importStatements,
-  ];
-}
-
-export function generateSyncUpdateMethod(
-  url: string,
-  method: string,
-  modelName: string,
-  operationId: string,
-  requestBody: string | undefined,
-  responseBody: string | undefined,
-  pathParameters: string[],
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const paramNames = `I${operationIdUpper}Params`;
-  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
-  const isCreate = pathParameters.length === 0;
-  const idParam = pathParameters[0];
-
-  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
-  urlStructure = `(params) => \`${urlStructure}\``;
-
-  const importStatements = new Set<string>();
-  importStatements.add("sync:useEntityMutation");
-  importStatements.add(paramNames);
-  if (requestBody) {
-    importStatements.add(requestBody);
-  }
-  if (responseBody) {
-    importStatements.add(responseBody);
-  }
-
-  const idLine = isCreate
-    ? ""
-    : `\n    id: (params) => params.${idParam} as string | number | undefined,`;
-
-  return [
-    `
-export function use${methodUpper}${operationIdUpper}() {
-  return useEntityMutation<${paramNames}, ${requestBody || "any"}, ${responseBody || "any"}>(${entityConstName(modelName)}, {
-    op: "${isCreate ? "create" : "update"}",
-    method: "${method}",
-    url: ${urlStructure},${idLine}
-  });
-}`,
-    importStatements,
-  ];
-}
-
-export function generateSyncDeleteMethod(
-  url: string,
-  modelName: string,
-  operationId: string,
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const urlStructure = url.replace(/{[^}]+}/, "${id}");
-  const importStatements = new Set<string>();
-  importStatements.add("sync:useEntityDelete");
-
-  return [
-    `
-export function use${operationIdUpper}() {
-  return useEntityDelete(${entityConstName(modelName)}, {
-    url: (id) => \`${urlStructure}\`,
-  });
-}
-`,
-    importStatements,
-  ];
-}
-
-export function generateConfirmedMethod(
-  url: string,
-  method: string,
-  operationId: string,
-  requestBody: string | undefined,
-  responseBody: string | undefined,
-): [string, Set<string>] {
-  const operationIdUpper = capitaliseFirstLetter(operationId);
-  const paramNames = `I${operationIdUpper}Params`;
-  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
-
-  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
-  urlStructure = `(params) => \`${urlStructure}\``;
-
-  const importStatements = new Set<string>();
-  importStatements.add("sync:useConfirmedMutation");
-  importStatements.add(paramNames);
-  if (requestBody) {
-    importStatements.add(requestBody);
-  }
-  if (responseBody) {
-    importStatements.add(responseBody);
-  }
-
-  return [
-    `
-// Confirmed ("sync") operation: blocking, online-only, no optimistic apply.
-export function use${methodUpper}${operationIdUpper}() {
-  return useConfirmedMutation<${paramNames}, ${requestBody || "any"}, ${responseBody || "any"}>({
-    method: "${method}",
-    url: ${urlStructure},
-  });
-}`,
-    importStatements,
-  ];
-}
+import { capitaliseFirstLetter } from "../schema/capitalise-first-letter";
+import { toCamelCase } from "../schema/to-camel-case";
+
+/**
+ * Generators for sync-mode entities (operations carrying the
+ * `x-rastack-sync` OpenAPI extension emitted by rastack). Reads bind to the
+ * local store, writes enqueue optimistic transactions, and operations the
+ * fat class marked as confirmed become blocking online-only mutations.
+ *
+ * Imports prefixed with "sync:" are routed to 'rastack/sync' by
+ * generateImportStatements.
+ */
+
+export interface EntitySyncMeta {
+  sync: boolean;
+  /** Sync.load = "lazy": excluded from initial bootstrap, loaded on first use. */
+  lazy?: boolean;
+  /** Sync.client_ids = True: rows use client-generated UUID primary keys. */
+  clientIds?: boolean;
+  confirmedOperationIds: Set<string>;
+  listUrl?: string;
+  detailUrl?: string;
+  detailParam?: string;
+  listOperationId?: string;
+  detailOperationId?: string;
+  rowSchema?: string; // e.g. "IPet"
+}
+
+export function entityConstName(model: string): string {
+  return `${toCamelCase(model)}Entity`;
+}
+
+export function generateEntityDescriptor(
+  appName: string,
+  modelName: string,
+  meta: EntitySyncMeta,
+): [string, Set<string>] {
+  const importStatements = new Set<string>();
+  importStatements.add("sync:defineEntity");
+  if (meta.rowSchema) {
+    importStatements.add(meta.rowSchema);
+  }
+  const rowType = meta.rowSchema || "any";
+  const listUrl =
+    meta.listUrl ||
+    (meta.detailUrl ? meta.detailUrl.replace(/\/?\{[^}]+\}.*$/, "") : "");
+  const detailUrl = meta.detailUrl
+    ? meta.detailUrl.replace(/\{[^}]+\}/, "${id}")
+    : `${listUrl.replace(/\/$/, "")}/\${id}`;
+
+  const lazyLine = meta.lazy ? `\n  lazy: true,` : "";
+  const clientIdsLine = meta.clientIds ? `\n  clientIds: true,` : "";
+
+  return [
+    `
+export const ${entityConstName(modelName)} = defineEntity<${rowType}>({
+  app: "${appName}",
+  model: "${modelName}",
+  listUrl: \`${listUrl}\`,
+  detailUrl: (id) => \`${detailUrl}\`,${lazyLine}${clientIdsLine}
+});
+`,
+    importStatements,
+  ];
+}
+
+export function generateSyncListMethod(
+  modelName: string,
+  operationId: string,
+  rowSchema: string | undefined,
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const rowType = rowSchema || "any";
+  const importStatements = new Set<string>();
+  importStatements.add("sync:useEntityList");
+  importStatements.add("sync:EntityListOptions");
+  if (rowSchema) {
+    importStatements.add(rowSchema);
+  }
+  return [
+    `
+export function use${operationIdUpper}(
+  options?: EntityListOptions<${rowType}>
+) {
+  return useEntityList<${rowType}>(${entityConstName(modelName)}, options);
+}`,
+    importStatements,
+  ];
+}
+
+export function generateSyncRecordMethod(
+  modelName: string,
+  operationId: string,
+  rowSchema: string | undefined,
+  pathParameters: string[],
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const rowType = rowSchema || "any";
+  const paramNames = `I${operationIdUpper}Params`;
+  const idParam = pathParameters[0];
+  const importStatements = new Set<string>();
+  importStatements.add("sync:useEntityRecord");
+  importStatements.add(`GetQueryOptions, useGetQuery`);
+  importStatements.add(paramNames);
+  if (rowSchema) {
+    importStatements.add(rowSchema);
+  }
+  return [
+    `
+export function use${operationIdUpper}(
+  options?: GetQueryOptions<${paramNames}>
+) {
+  const id = options?.params?.${idParam};
+  return useEntityRecord<${rowType}>(${entityConstName(modelName)}, id as string | number | undefined);
+}`,
+    importStatements,
+  ];
+}
+
+export function generateSyncUpdateMethod(
+  url: string,
+  method: string,
+  modelName: string,
+  operationId: string,
+  requestBody: string | undefined,
+  responseBody: string | undefined,
+  pathParameters: string[],
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const paramNames = `I${operationIdUpper}Params`;
+  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
+  const isCreate = pathParameters.length === 0;
+  const idParam = pathParameters[0];
+
+  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
+  urlStructure = `(params) => \`${urlStructure}\``;
+
+  const importStatements = new Set<string>();
+  importStatements.add("sync:useEntityMutation");
+  importStatements.add(paramNames);
+  if (requestBody) {
+    importStatements.add(requestBody);
+  }
+  if (responseBody) {
+    importStatements.add(responseBody);
+  }
+
+  const idLine = isCreate
+    ? ""
+    : `\n    id: (params) => params.${idParam} as string | number | undefined,`;
+
+  return [
+    `
+export function use${methodUpper}${operationIdUpper}() {
+  return useEntityMutation<${paramNames}, ${requestBody || "any"}, ${responseBody || "any"}>(${entityConstName(modelName)}, {
+    op: "${isCreate ? "create" : "update"}",
+    method: "${method}",
+    url: ${urlStructure},${idLine}
+  });
+}`,
+    importStatements,
+  ];
+}
+
+export function generateSyncDeleteMethod(
+  url: string,
+  modelName: string,
+  operationId: string,
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const urlStructure = url.replace(/{[^}]+}/, "${id}");
+  const importStatements = new Set<string>();
+  importStatements.add("sync:useEntityDelete");
+
+  return [
+    `
+export function use${operationIdUpper}() {
+  return useEntityDelete(${entityConstName(modelName)}, {
+    url: (id) => \`${urlStructure}\`,
+  });
+}
+`,
+    importStatements,
+  ];
+}
+
+export function generateConfirmedMethod(
+  url: string,
+  method: string,
+  operationId: string,
+  requestBody: string | undefined,
+  responseBody: string | undefined,
+): [string, Set<string>] {
+  const operationIdUpper = capitaliseFirstLetter(operationId);
+  const paramNames = `I${operationIdUpper}Params`;
+  const methodUpper = method.charAt(0).toUpperCase() + method.slice(1);
+
+  let urlStructure = url.replace(/{([^}]+)}/g, "${params.$1}");
+  urlStructure = `(params) => \`${urlStructure}\``;
+
+  const importStatements = new Set<string>();
+  importStatements.add("sync:useConfirmedMutation");
+  importStatements.add(paramNames);
+  if (requestBody) {
+    importStatements.add(requestBody);
+  }
+  if (responseBody) {
+    importStatements.add(responseBody);
+  }
+
+  return [
+    `
+// Confirmed ("sync") operation: blocking, online-only, no optimistic apply.
+export function use${methodUpper}${operationIdUpper}() {
+  return useConfirmedMutation<${paramNames}, ${requestBody || "any"}, ${responseBody || "any"}>({
+    method: "${method}",
+    url: ${urlStructure},
+  });
+}`,
+    importStatements,
+  ];
+}