@olenbetong/appframe-vite 6.3.2 → 6.3.3

package/lib/cli-resources-generate.js

@@ -1,11 +1,32 @@
 import { mkdir, writeFile } from "node:fs/promises";
-import { dirname, resolve } from "node:path";
+import { dirname, relative, resolve, sep } from "node:path";
 import { Client } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
 import { getLoginInfo } from "./devServer.js";
 import { fetchAndGenerate, formatWithBiome } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig } from "./resourcesConfig.js";
 config({ quiet: true });
+/**
+ * If `entry.master` is a bare ID (no colon), look it up in the data objects list and
+ * inject the relative import path so the generator emits the correct import statement.
+ */
+function resolveMasterImport(entry, allDataObjects) {
+    if (!entry.master || entry.master.includes(":")) {
+        return entry;
+    }
+    let masterId = entry.master;
+    let masterEntry = allDataObjects.find((e) => e.id === masterId);
+    if (!masterEntry) {
+        return entry;
+    }
+    let thisOutputPath = resolve(process.cwd(), entry.output ?? `src/data/${entry.id}.ts`);
+    let masterOutputPath = resolve(process.cwd(), masterEntry.output ?? `src/data/${masterEntry.id}.ts`);
+    let rel = relative(dirname(thisOutputPath), masterOutputPath).replace(/\.ts$/, "").split(sep).join("/");
+    if (!rel.startsWith(".")) {
+        rel = `./${rel}`;
+    }
+    return { ...entry, master: `${masterId}:${rel}` };
+}
 export async function generateFromConfig(configPath) {
     let { hostname, username, password } = await getLoginInfo();
     let resourcesConfig = await readResourcesConfig(configPath);
@@ -20,8 +41,10 @@ export async function generateFromConfig(configPath) {
     let client = new Client(hostname);
     await client.login(username, password);
     let errors = [];
+    let allDataObjects = resourcesConfig.dataObjects ?? [];
     for (let { entry } of allEntries) {
-        let options = entryToCLIOptions(entry, resourcesConfig.server ?? hostname);
+        let resolvedEntry = resolveMasterImport(entry, allDataObjects);
+        let options = entryToCLIOptions(resolvedEntry, resourcesConfig.server ?? hostname);
         options.output = resolve(process.cwd(), entry.output ?? `src/data/${entry.id}.ts`);
         try {
             let content = await fetchAndGenerate(entry.resource, options, client);

package/lib/resourceGenerate.js

@@ -436,7 +436,7 @@ ${fieldTypes}}`;
     }
     dsOptions.push(`id: "${options.id}"`);
     if (options.master && options.linkFields) {
-        dsOptions.push(`masterDataObject: ${options.master.split(":")[0]}`);
+        dsOptions.push(`masterDataObject: ${options.master.split(":")[0]} as any`);
         let fields = options.linkFields.split(",");
         linkFields = `linkFields: {\n\t\t${fields
             .map((field) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.3.2",
+  "version": "6.3.3",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -30,10 +30,10 @@
   "license": "MIT",
   "dependencies": {
     "@olenbetong/appframe-data": "1.5.0",
-    "body-parser": "^2.2.2",
-    "chalk": "^5.6.2",
+    "body-parser": "^2.3.0",
+    "chalk": "5.6.2",
     "chokidar": "^5.0.0",
-    "commander": "^14.0.3",
+    "commander": "15.0.0",
     "dotenv": "^17.4.2",
     "fuzzy": "^0.1.3",
     "inquirer": "^13.4.3",
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@types/jsdom": "^27.0.0",
-    "@types/node": "25.9.1",
+    "@types/node": "25.9.3",
     "typescript": "6.0.3",
-    "vite": "8.0.14"
+    "vite": "8.0.16"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"