@olenbetong/appframe-vite 6.15.0 → 6.16.0

package/lib/appEntry.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Resolves the app's entry module. Apps have no `index.html`: the dev server fetches the
+ * article's HTML from Synergi and injects a `<script type="module">` pointing at this file,
+ * and the production build uses it as the single rolldown input.
+ *
+ * `relative` is a POSIX path from the root, usable as a glob pattern (`optimizeDeps.entries`
+ * takes globs, and an absolute Windows path would be read as one with escapes in it).
+ * The last candidate is returned even when it does not exist, so a missing entry fails
+ * with a resolve error that names the file instead of a vaguer one later on.
+ */
+export declare function getAppEntry(root?: string): {
+    absolute: string;
+    relative: string;
+    url: string;
+};

package/lib/appEntry.js

@@ -0,0 +1,19 @@
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
+/** The entry file candidates, in the order they are tried, relative to the app root. */
+const ENTRY_CANDIDATES = ["src/index.tsx", "src/index.ts", "src/index.js"];
+/**
+ * Resolves the app's entry module. Apps have no `index.html`: the dev server fetches the
+ * article's HTML from Synergi and injects a `<script type="module">` pointing at this file,
+ * and the production build uses it as the single rolldown input.
+ *
+ * `relative` is a POSIX path from the root, usable as a glob pattern (`optimizeDeps.entries`
+ * takes globs, and an absolute Windows path would be read as one with escapes in it).
+ * The last candidate is returned even when it does not exist, so a missing entry fails
+ * with a resolve error that names the file instead of a vaguer one later on.
+ */
+export function getAppEntry(root = process.cwd()) {
+    let found = ENTRY_CANDIDATES.find((candidate) => existsSync(resolve(root, candidate)));
+    let relative = found ?? ENTRY_CANDIDATES[ENTRY_CANDIDATES.length - 1];
+    return { absolute: resolve(root, relative), relative, url: `/${relative}` };
+}

package/lib/appframeDataGlobal.js

@@ -19,6 +19,8 @@ export const GLOBAL_EXPORTS = [
     "Procedure",
     "ProcedureAPI",
     "SortOrder",
+    "UploadManager",
+    "UploadTask",
     "generateApiDataHandler",
     "generateApiDataObject",
     "getDefaultClient",

package/lib/build.js

@@ -1,8 +1,8 @@
-import { existsSync } from "node:fs";
 import { readdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
 import { visualizer } from "rollup-plugin-visualizer";
 import { esmExternalRequirePlugin } from "vite";
+import { getAppEntry } from "./appEntry.js";
 import { importJson } from "./importJson.js";
 /**
  * The bare specifiers the 2026 site templates resolve through their import map to the
@@ -202,16 +202,9 @@ export async function addAppframeBuildConfig(config) {
         sourcemap: true,
     };
     config.plugins = config.plugins ?? [];
-    let entry = resolve(process.cwd(), "./src/index.tsx");
-    if (!existsSync(resolve(entry))) {
-        entry = resolve(process.cwd(), "./src/index.ts");
-    }
-    if (!existsSync(resolve(entry))) {
-        entry = resolve(process.cwd(), "./src/index.js");
-    }
     config.appType = "custom";
     config.build.rolldownOptions = {
-        input: { main: entry },
+        input: { main: getAppEntry().absolute },
         plugins: [
             // Cast visualizer plugin to any to avoid Rollup type version clashes
             visualizer({ filename: "./dist/stats.html", gzipSize: true }),

package/lib/cli-resources-migrate.js

@@ -182,6 +182,10 @@ function dataObjectToEntry(datasource, fields, outputDir, warnings) {
     if (sortFields.length > 0) {
         entry.sortOrder = sortFields.map((f) => {
             let direction = (f.AscDesc ?? "asc").toLowerCase();
+            // Keep the null placement of AscNullsLast / DescNullsFirst
+            if (direction === "ascnullslast" || direction === "descnullsfirst") {
+                return { field: f.FieldName, direction };
+            }
             return direction.startsWith("desc") ? { field: f.FieldName, direction: "desc" } : { field: f.FieldName };
         });
     }

package/lib/devServer.js

@@ -5,6 +5,7 @@ import { AuthenticationError, authenticate, loginHint, resolveCredentials } from
 import { Client } from "@olenbetong/appframe-data";
 import dotenv from "dotenv";
 import { JSDOM } from "jsdom";
+import { getAppEntry } from "./appEntry.js";
 import { importJson } from "./importJson.js";
 import { getStringCache } from "./localization.js";
 import { diagnoseServerResponse } from "./utils.js";
@@ -68,16 +69,7 @@ export function getProxyRoutes() {
  * @returns
  */
 async function transformArticleHtml(html) {
-    let entry;
-    if (existsSync(resolve(process.cwd(), "./src/index.tsx"))) {
-        entry = "/src/index.tsx";
-    }
-    else if (existsSync(resolve(process.cwd(), "./src/index.ts"))) {
-        entry = "/src/index.ts";
-    }
-    else {
-        entry = "/src/index.js";
-    }
+    let entry = getAppEntry().url;
     let article = appframe.article?.id;
     let { hostname } = await getAppHostname();
     let dom = new JSDOM(html);

package/lib/index.js

@@ -2,6 +2,7 @@ import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
 import bodyParser from "body-parser";
 import { watch } from "chokidar";
+import { getAppEntry } from "./appEntry.js";
 import { appframeDataGlobal } from "./appframeDataGlobal.js";
 import { addAppframeBuildConfig, PLATFORM_EXTERNALS, PLATFORM_GLOBALS, PLATFORM_UPSTREAM, platformManifest, usesPlatform, } from "./build.js";
 import { generateFromConfig } from "./cli-resources-generate.js";
@@ -184,6 +185,19 @@ export default function appframe(options = {}) {
                     ...config.server,
                     proxy,
                 };
+                // Apps have no index.html, so the dependency scanner Vite runs at startup has
+                // nothing to crawl (it globs "**/*.html") and skips pre-bundling altogether. Every
+                // dependency is then discovered when a module first imports it: the ones behind
+                // the initial page load are batched, but a lazy route that pulls in a new one
+                // re-runs the optimizer and forces a full reload, which lands back on the page
+                // you navigated from. Crawling from the entry module finds the lazy imports up
+                // front, so the deps are ready before the browser asks for them.
+                if (!config.optimizeDeps?.entries) {
+                    config.optimizeDeps = {
+                        ...config.optimizeDeps,
+                        entries: [getAppEntry().relative],
+                    };
+                }
             }
             return config;
         },

package/lib/resourceGenerate.js

@@ -169,6 +169,13 @@ export function parseYamlConfig(fileContent) {
 // ---------------------------------------------------------------------------
 // Code generation helpers
 // ---------------------------------------------------------------------------
+/**
+ * A field name as an object key in generated code, quoted when it is not a valid identifier,
+ * such as a view column named `EU-Neste`.
+ */
+function propertyKey(name) {
+    return /^[A-Za-z_$][\w$]*$/.test(name) ? name : JSON.stringify(name);
+}
 /**
  * Convert Appframe (SQL) data types to typescript/field definition types
  */
@@ -394,7 +401,7 @@ export function getDataObjectDefinition(name, viewDefinition, options) {
                     type += " | null";
                 }
             }
-            fieldTypes += `  ${field.name}: ${type};\n`;
+            fieldTypes += `  ${propertyKey(field.name)}: ${type};\n`;
         }
         types = `export type ${typeName} = {
 ${fieldTypes}}`;
@@ -465,7 +472,7 @@ ${fieldTypes}}`;
                     order = "DescNullsFirst";
                     break;
             }
-            return `{ ${field}: ${sortPrefix}${order} }`;
+            return `{ ${propertyKey(field)}: ${sortPrefix}${order} }`;
         })
             .join(", ");
         parametersOption.push(`sortOrder: [${sortOrder}]`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.15.0",
+  "version": "6.16.0",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -30,24 +30,24 @@
   "license": "MIT",
   "dependencies": {
     "@olenbetong/appframe-auth": "^0.1.0",
-    "@olenbetong/appframe-data": "^1.8.2",
+    "@olenbetong/appframe-data": "^1.8.3",
     "body-parser": "^2.3.0",
     "chalk": "6.0.1",
     "chokidar": "^5.0.0",
     "commander": "15.0.0",
-    "dotenv": "^18.0.4",
+    "dotenv": "^18.0.8",
     "fuzzy": "^0.1.3",
-    "inquirer": "^14.2.2",
+    "inquirer": "^14.2.4",
     "inquirer-autocomplete-standalone": "^0.8.1",
-    "jsdom": "30.1.1",
+    "jsdom": "30.1.3",
     "rollup-plugin-visualizer": "^7.1.1",
     "yaml": "^2.9.1"
   },
   "devDependencies": {
     "@types/jsdom": "^30.0.0",
-    "@types/node": "26.6.3",
+    "@types/node": "26.6.5",
     "typescript": "7.0.2",
-    "vite": "8.3.1"
+    "vite": "8.3.5"
   },
   "peerDependencies": {
     "vite": ">=8.1.5"