@olenbetong/appframe-vite 6.17.0 → 6.17.1

package/lib/cli-resources-migrate.js

@@ -3,7 +3,7 @@ import { authenticate } from "@olenbetong/appframe-auth";
 import { Client, generateApiDataHandler } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
 import { getAppHostname } from "./devServer.js";
-import { fetchAndGenerate, writeGeneratedFile } from "./resourceGenerate.js";
+import { fetchAndGenerate, getUniqueDefinitionName, writeGeneratedFile } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig, writeResourcesConfig, } from "./resourcesConfig.js";
 config({ quiet: true });
 /** Views holding the CMS article configuration. They are registered on demand. */
@@ -155,8 +155,10 @@ function dataObjectToEntry(datasource, fields, outputDir, warnings) {
         entry.maxRecords = datasource.MaxRecords;
     if (datasource.WhereClause)
         entry.where = datasource.WhereClause;
-    if (datasource.UniqueTableName && datasource.UniqueTableName !== datasource.ViewName) {
-        entry.unique = datasource.UniqueTableName;
+    // A table as the unique table means its security view: the data API saves through views.
+    let unique = datasource.UniqueTableName ? getUniqueDefinitionName(datasource.UniqueTableName) : null;
+    if (unique && unique !== datasource.ViewName) {
+        entry.unique = unique;
     }
     if (datasource.DynamicLoading)
         entry.dynamic = true;

package/lib/resourceGenerate.d.ts

@@ -55,6 +55,11 @@ export declare function parseYamlConfig(fileContent: string): {
 export declare function getCustomImportPath(outputPath: string): string;
 export declare function getProcedureDefinition(name: string, procDefinition: any, options: CLIOptions): string;
 export declare function getDataObjectDefinition(name: string, viewDefinition: any, options: CLIOptions): string;
+/**
+ * The object to read a unique table's columns from. Tables are not data API resources, so a
+ * table (`atbl_`) is read through its security view (`atbv_`), which has the same columns.
+ */
+export declare function getUniqueDefinitionName(unique: string): string;
 /**
  * Fetch the resource definition from an authenticated Appframe client.
  */

package/lib/resourceGenerate.js

@@ -373,6 +373,11 @@ export function getDataObjectDefinition(name, viewDefinition, options) {
         }
         if (aggregates[field.Name]) {
             fieldDefinition.aggregate = aggregates[field.Name];
+            // A count is a number whatever the column it counts, and never null.
+            if (/^COUNT/i.test(aggregates[field.Name])) {
+                fieldDefinition.type = "int";
+                fieldDefinition.nullable = false;
+            }
         }
         fields.push(fieldDefinition);
     }
@@ -520,6 +525,13 @@ ${fieldTypes}}`;
 // ---------------------------------------------------------------------------
 // Server interaction
 // ---------------------------------------------------------------------------
+/**
+ * The object to read a unique table's columns from. Tables are not data API resources, so a
+ * table (`atbl_`) is read through its security view (`atbv_`), which has the same columns.
+ */
+export function getUniqueDefinitionName(unique) {
+    return unique.startsWith("atbl_") ? `atbv_${unique.slice(5)}` : unique;
+}
 /**
  * Fetch the resource definition from an authenticated Appframe client.
  */
@@ -567,11 +579,11 @@ export async function fetchAndGenerate(resourceName, options, client) {
     // lacks. CMS data objects know to leave those out of a save; mark them ignored so these do too.
     if (definition.ObjectType === "V" && options.unique) {
         try {
-            let uniqueDefinition = await fetchResourceDefinition(client, options.unique);
+            let uniqueDefinition = await fetchResourceDefinition(client, getUniqueDefinitionName(options.unique));
             options.uniqueFields = (uniqueDefinition.Parameters ?? []).map((p) => p.Name);
         }
         catch (error) {
-            console.warn(`Could not read the unique table '${options.unique}' for '${resourceName}', so no fields are marked ignored: ${error instanceof Error ? error.message.split(" — ")[0] : error}`);
+            console.warn(`Could not read the unique table '${getUniqueDefinitionName(options.unique)}' for '${resourceName}', so no fields are marked ignored: ${error instanceof Error ? error.message.split(" — ")[0] : error}`);
         }
     }
     return definition.ObjectType === "V"

package/lib/uniqueIgnoredFields.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { getDataObjectDefinition } from "./resourceGenerate.js";
+import { getDataObjectDefinition, getUniqueDefinitionName } from "./resourceGenerate.js";
 import { entryToCLIOptions } from "./resourcesConfig.js";
 const definition = {
     ObjectType: "V",
@@ -31,3 +31,28 @@ describe("fields outside the unique table", () => {
         expect(generate(undefined)).not.toContain('"ignored"');
     });
 });
+describe("getUniqueDefinitionName", () => {
+    it("reads a table through its security view", () => {
+        expect(getUniqueDefinitionName("atbl_Production_Plans")).toBe("atbv_Production_Plans");
+    });
+    it("keeps views as they are", () => {
+        expect(getUniqueDefinitionName("atbv_Production_Plans")).toBe("atbv_Production_Plans");
+        expect(getUniqueDefinitionName("atbx_Accounting_Projects")).toBe("atbx_Accounting_Projects");
+    });
+});
+describe("count aggregates", () => {
+    it("types a counted column as a number", () => {
+        let options = entryToCLIOptions({
+            id: "dsSummary",
+            resource: "aviw_Production_Plans",
+            output: "src/dsSummary.ts",
+            global: true,
+            types: true,
+            groupBy: ["ProjectID"],
+            aggregates: [{ field: "ProjectName", aggregate: "COUNT" }],
+        }, "example.com");
+        let output = getDataObjectDefinition("aviw_Production_Plans", definition, options);
+        expect(output).toContain("ProjectName: number;");
+        expect(output).toMatch(/"name": "ProjectName",\s*"type": "number"/);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.17.0",
+  "version": "6.17.1",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -31,11 +31,11 @@
   "dependencies": {
     "@olenbetong/appframe-auth": "^0.1.0",
     "@olenbetong/appframe-data": "^1.8.4",
-    "body-parser": "^2.3.0",
+    "body-parser": "^2.4.0",
     "chalk": "6.0.1",
     "chokidar": "^5.0.0",
     "commander": "15.0.0",
-    "dotenv": "^18.0.8",
+    "dotenv": "^18.0.9",
     "fuzzy": "^0.1.3",
     "inquirer": "^14.2.4",
     "inquirer-autocomplete-standalone": "^0.8.1",