@olenbetong/appframe-vite 6.1.2 → 6.3.0

package/lib/resourcesConfig.js

@@ -0,0 +1,180 @@
+import { existsSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { resolve } from "node:path";
+import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
+/**
+ * Build an inline TypeScript type string from a structured returnType definition.
+ *
+ * The server always returns a DataSet serialized as `{ Table: T[], Table1: U[], ... }`.
+ * The first table is always `"Table"`, subsequent ones are `"Table1"`, `"Table2"`, etc.
+ * An explicit `table` name on the entry overrides the auto-generated key (for procedures
+ * that assign custom DataTable.TableName values).
+ */
+export function returnTypeToString(returnType) {
+    if (returnType.length === 0) {
+        return "unknown";
+    }
+    function tableRowType(table) {
+        if (table.fields.length === 0) {
+            return "Record<string, unknown>";
+        }
+        let props = table.fields.map((f) => `${f.name}: ${f.type}`).join("; ");
+        return `{ ${props} }`;
+    }
+    function tableKey(table, index) {
+        if (table.table) {
+            return table.table;
+        }
+        return index === 0 ? "Table" : `Table${index}`;
+    }
+    let props = returnType.map((t, i) => `${tableKey(t, i)}: ${tableRowType(t)}[]`).join("; ");
+    return `{ ${props} }`;
+}
+// ---------------------------------------------------------------------------
+// Config file path
+// ---------------------------------------------------------------------------
+export const RESOURCES_CONFIG_FILE = "resources.yaml";
+export function getResourcesConfigPath(filePath) {
+    return resolve(process.cwd(), filePath ?? RESOURCES_CONFIG_FILE);
+}
+// ---------------------------------------------------------------------------
+// Read / write
+// ---------------------------------------------------------------------------
+export async function readResourcesConfig(filePath) {
+    let configPath = getResourcesConfigPath(filePath);
+    if (!existsSync(configPath)) {
+        return {};
+    }
+    let raw = await readFile(configPath, "utf-8");
+    return parseYaml(raw) ?? {};
+}
+export async function writeResourcesConfig(config, filePath) {
+    let configPath = getResourcesConfigPath(filePath);
+    let content = stringifyYaml(config, { lineWidth: 120 });
+    await writeFile(configPath, content, "utf-8");
+}
+// ---------------------------------------------------------------------------
+// Convert ResourceEntry ↔ CLIOptions
+// ---------------------------------------------------------------------------
+function arrayOrStringToString(value) {
+    if (value === undefined)
+        return undefined;
+    if (Array.isArray(value))
+        return value.join(",");
+    return value;
+}
+/** Convert sortOrder (new object format, old string/array) to comma-separated CLIOptions string. */
+function sortOrderToString(sortOrder) {
+    if (!sortOrder)
+        return undefined;
+    if (typeof sortOrder === "string")
+        return sortOrder;
+    if (Array.isArray(sortOrder) && sortOrder.length === 0)
+        return undefined;
+    if (typeof sortOrder[0] === "string")
+        return sortOrder.join(",");
+    return sortOrder
+        .map((s) => (s.direction ? `${s.field}:${s.direction}` : s.field))
+        .join(",");
+}
+/** Convert aggregates (new object format, old string/array) to comma-separated CLIOptions string. */
+function aggregatesToString(aggregates) {
+    if (!aggregates)
+        return undefined;
+    if (typeof aggregates === "string")
+        return aggregates;
+    if (Array.isArray(aggregates) && aggregates.length === 0)
+        return undefined;
+    if (typeof aggregates[0] === "string")
+        return aggregates.join(",");
+    return aggregates.map((a) => `${a.field}:${a.aggregate}`).join(",");
+}
+/** Convert a `ResourceEntry` into a `CLIOptions`-compatible object for code generation. */
+export function entryToCLIOptions(entry, hostname) {
+    return {
+        server: hostname,
+        id: entry.id,
+        global: entry.global ?? false,
+        dynamic: entry.dynamic ?? false,
+        types: entry.types,
+        maxRecords: entry.maxRecords !== undefined ? String(entry.maxRecords) : "50",
+        sortOrder: sortOrderToString(entry.sortOrder),
+        permissions: entry.permissions,
+        master: entry.master,
+        linkFields: arrayOrStringToString(entry.linkFields),
+        expose: entry.expose,
+        unique: entry.unique,
+        overrides: arrayOrStringToString(entry.overrides),
+        distinct: entry.distinct,
+        aggregates: aggregatesToString(entry.aggregates),
+        groupBy: entry.groupBy?.join(","),
+        where: entry.where,
+        fields: arrayOrStringToString(entry.fields) ?? false,
+        output: resolve(process.cwd(), entry.output ?? `src/data/${entry.id}.ts`),
+        typesJsonReturnType: entry.returnType ? returnTypeToString(entry.returnType) : undefined,
+    };
+}
+/** Convert a `CLIOptions` back to a `ResourceEntry` for saving to YAML. */
+export function cliOptionsToEntry(resource, options) {
+    function maybeArray(value) {
+        if (!value)
+            return undefined;
+        let arr = value.split(",").filter(Boolean);
+        return arr.length > 1 ? arr : undefined;
+    }
+    let entry = {
+        id: options.id,
+        resource,
+        output: options.output ?? `src/data/${options.id}.ts`,
+    };
+    if (options.global)
+        entry.global = true;
+    if (options.types)
+        entry.types = true;
+    if (options.permissions)
+        entry.permissions = options.permissions;
+    if (options.maxRecords && options.maxRecords !== "50") {
+        entry.maxRecords = Number(options.maxRecords);
+    }
+    if (options.sortOrder) {
+        entry.sortOrder = options.sortOrder
+            .split(",")
+            .filter(Boolean)
+            .map((s) => {
+            const [field, direction] = s.split(":");
+            return direction ? { field, direction } : { field };
+        });
+    }
+    if (options.master)
+        entry.master = options.master;
+    if (options.linkFields)
+        entry.linkFields = maybeArray(options.linkFields) ?? options.linkFields;
+    if (options.expose !== undefined)
+        entry.expose = options.expose;
+    if (options.dynamic)
+        entry.dynamic = true;
+    if (options.unique)
+        entry.unique = options.unique;
+    if (options.overrides)
+        entry.overrides = maybeArray(options.overrides) ?? options.overrides;
+    if (options.distinct)
+        entry.distinct = true;
+    if (options.aggregates) {
+        entry.aggregates = options.aggregates
+            .split(",")
+            .filter(Boolean)
+            .map((a) => {
+            const [field, aggregate] = a.split(":");
+            return { field, aggregate: aggregate ?? "" };
+        });
+    }
+    if (options.groupBy)
+        entry.groupBy = options.groupBy.split(",").filter(Boolean);
+    if (options.where)
+        entry.where = options.where;
+    if (options.fields && typeof options.fields === "string") {
+        let fields = options.fields.split(",").filter(Boolean);
+        entry.fields = fields.length > 1 ? fields : options.fields;
+    }
+    return entry;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.1.2",
+  "version": "6.3.0",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -13,6 +13,10 @@
     "./proxy": {
       "import": "./lib/proxy.js",
       "types": "./lib/proxy.d.ts"
+    },
+    "./resources": {
+      "import": "./lib/resourceGenerate.js",
+      "types": "./lib/resourceGenerate.d.ts"
     }
   },
   "files": [
@@ -25,19 +29,25 @@
   "author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
   "license": "MIT",
   "dependencies": {
+    "@olenbetong/appframe-data": "1.5.0",
     "body-parser": "^2.2.2",
     "chalk": "^5.4.1",
     "chokidar": "^5.0.0",
+    "commander": "^14.0.1",
     "dotenv": "^17.2.3",
-    "jsdom": "29.0.2",
+    "fuzzy": "^0.1.3",
+    "inquirer": "^12.9.6",
+    "inquirer-autocomplete-standalone": "^0.8.1",
+    "jsdom": "29.1.1",
     "rollup-plugin-visualizer": "^6.0.5",
-    "@olenbetong/appframe-data": "1.5.0"
+    "yaml": "^2.8.4",
+    "@olenbetong/appframe-devtools": "0.1.0"
   },
   "devDependencies": {
     "@types/jsdom": "^27.0.0",
     "@types/node": "25.6.0",
     "typescript": "6.0.3",
-    "vite": "8.0.8"
+    "vite": "8.0.10"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"