@rljson/rljson 0.0.39 → 0.0.42

package/dist/content/table-cfg.d.ts

@@ -9,6 +9,10 @@ export type TableCfgRef = Ref;
  * A column configuration
  */
 export interface ColumnCfg extends Json {
+    /**
+     * The technical lower camel case json identifier of the column
+     */
+    key: ColumnKey;
     /**
      * The type of the column
      */
@@ -25,7 +29,7 @@ export interface TableCfg extends Json {
     /**
      * A short description of the table
      */
-    columns: Record<ColumnKey, ColumnCfg>;
+    columns: ColumnCfg[];
     /**
      * The content type of the table
      */
@@ -68,17 +72,6 @@ export interface TableCfg extends Json {
  * A table containing columns
  */
 export type TablesCfgTable = RljsonTable<TableCfg, 'ingredients'>;
-/**
- * Offers tools for working with table configurations
- */
-export declare class TableCfgTools {
-    readonly tableCfg: TableCfg;
-    constructor(tableCfg: TableCfg);
-    /**
-     * Returns all column keys
-     */
-    get columnKeys(): ColumnKey[];
-}
 /**
  * Example matching allTypesRow
  */

package/dist/rljson.js

@@ -191,32 +191,40 @@ __publicField(_Example, "ok", {
           isHead: false,
           isRoot: false,
           isShared: true,
-          columns: {
-            int: {
+          columns: [
+            {
+              key: "int",
               type: "number"
             },
-            double: {
+            {
+              key: "double",
               type: "number"
             },
-            string: {
+            {
+              key: "string",
               type: "string"
             },
-            boolean: {
+            {
+              key: "boolean",
               type: "boolean"
             },
-            null: {
-              type: "null"
+            {
+              key: "null",
+              type: "string"
             },
-            jsonArray: {
+            {
+              key: "jsonArray",
               type: "jsonArray"
             },
-            json: {
+            {
+              key: "json",
               type: "json"
             },
-            jsonValue: {
+            {
+              key: "jsonValue",
               type: "jsonValue"
             }
-          }
+          ]
         }
       ]
     });
@@ -427,8 +435,9 @@ __publicField(_Example, "broken", {
   tableCfg: {
     wrongType: () => {
       const result = _Example.ok.singleRow();
-      const tableCfg = result.tableCfgs._data[0];
-      tableCfg.columns["int"].type = "numberBroken";
+      const columns = result.tableCfgs._data[0].columns;
+      const intColumn = columns.find((c) => c.key === "int");
+      intColumn.type = "numberBroken";
       return hip(result, {
         updateExistingHashes: true,
         throwOnWrongHashes: false
@@ -524,33 +533,21 @@ __publicField(_Example, "broken", {
 });
 let Example = _Example;
 // @license
-class TableCfgTools {
-  constructor(tableCfg) {
-    this.tableCfg = tableCfg;
-  }
-  /**
-   * Returns all column keys
-   */
-  get columnKeys() {
-    const columnNames = Object.keys(this.tableCfg.columns).filter(
-      (e) => !e.startsWith("_")
-    );
-    return columnNames;
-  }
-}
 const exampleTableCfgTable = () => Example.ok.singleRow().tableCfgs;
 const exampleTableCfg = (tableCfg = void 0) => {
   return {
     key: (tableCfg == null ? void 0 : tableCfg.key) ?? "table",
     version: 1,
-    columns: (tableCfg == null ? void 0 : tableCfg.columns) ?? {
-      a: {
+    columns: (tableCfg == null ? void 0 : tableCfg.columns) ?? [
+      {
+        key: "a",
         type: "string"
       },
-      b: {
+      {
+        key: "b",
         type: "number"
       }
-    },
+    ],
     type: (tableCfg == null ? void 0 : tableCfg.type) ?? "ingredients",
     isHead: true,
     isRoot: true,
@@ -839,16 +836,14 @@ class _BaseValidator {
     }
     const brokenCfgs = [];
     for (const item of tableCfgs._data) {
-      for (const columnKey in item.columns) {
-        if (columnKey.startsWith("_")) {
-          continue;
-        }
-        const column = item.columns[columnKey];
-        if (jsonValueTypes.indexOf(column.type) === -1) {
+      for (const columnCfg of item.columns) {
+        const columnKey = columnCfg.key;
+        const columnType = columnCfg.type;
+        if (jsonValueTypes.indexOf(columnType) === -1) {
           brokenCfgs.push({
             brokenTableCfg: item._hash,
             brokenColumnKey: columnKey,
-            brokenColumnType: column.type
+            brokenColumnType: columnType
           });
         }
       }
@@ -905,7 +900,10 @@ class _BaseValidator {
         );
         for (const columnKey of newColumnKey) {
           const columns = tableCfgData.columns;
-          if (!columns[columnKey]) {
+          const columnConfig = columns.find(
+            (column) => column.key === columnKey
+          );
+          if (!columnConfig) {
             missingColumnConfigs.push({
               tableCfg: tableCfgRef,
               row: row._hash,
@@ -940,13 +938,14 @@ class _BaseValidator {
         );
         for (const columnKey of columnKeys) {
           const columns = tableCfgData.columns;
-          const columnConfig = columns[columnKey];
+          const columnConfig = columns.find((e) => e.key === columnKey);
           const value = row[columnKey];
           if (value == null || value == void 0) {
             continue;
           }
           const typeShould = columnConfig.type;
           if (!jsonValueMatchesType(value, typeShould)) {
+            jsonValueMatchesType(value, typeShould);
             brokenValues.push({
               table: tableKey,
               row: row._hash,
@@ -1048,7 +1047,7 @@ class _BaseValidator {
         continue;
       }
       const columns = cfg.columns;
-      const idField = columns["id"];
+      const idField = columns.find((e) => e.key === "id");
       if (!idField) {
         rootOrHeadTablesWithoutIdColumns.push({
           table: tableKey,
@@ -1504,7 +1503,6 @@ class Validate {
 export {
   BaseValidator,
   Example,
-  TableCfgTools,
   Validate,
   bakeryExample,
   contentTypes,

package/dist/src/example.ts

@@ -12,7 +12,7 @@ import { Cake, CakesTable } from './content/cake.ts';
 import { IngredientsTable } from './content/ingredients.ts';
 import { Layer, LayersTable } from './content/layer.ts';
 import { SliceIdsTable } from './content/slice-ids.ts';
-import { TablesCfgTable } from './content/table-cfg.ts';
+import { ColumnCfg, TablesCfgTable } from './content/table-cfg.ts';
 import { bakeryExample } from './example/bakery-example.ts';
 import { Rljson } from './rljson.ts';
 
@@ -52,32 +52,40 @@ export class Example {
             isHead: false,
             isRoot: false,
             isShared: true,
-            columns: {
-              int: {
+            columns: [
+              {
+                key: 'int',
                 type: 'number',
               },
-              double: {
+              {
+                key: 'double',
                 type: 'number',
               },
-              string: {
+              {
+                key: 'string',
                 type: 'string',
               },
-              boolean: {
+              {
+                key: 'boolean',
                 type: 'boolean',
               },
-              null: {
-                type: 'null',
+              {
+                key: 'null',
+                type: 'string',
               },
-              jsonArray: {
+              {
+                key: 'jsonArray',
                 type: 'jsonArray',
               },
-              json: {
+              {
+                key: 'json',
                 type: 'json',
               },
-              jsonValue: {
+              {
+                key: 'jsonValue',
                 type: 'jsonValue',
               },
-            },
+            ],
           },
         ],
       });
@@ -305,8 +313,9 @@ export class Example {
     tableCfg: {
       wrongType: () => {
         const result = Example.ok.singleRow();
-        const tableCfg = result.tableCfgs._data[0];
-        tableCfg.columns['int'].type = 'numberBroken'; // Break one of the types
+        const columns = result.tableCfgs._data[0].columns as ColumnCfg[];
+        const intColumn = columns.find((c) => c.key === 'int')!;
+        intColumn.type = 'numberBroken' as any; // Break one of the types
         return hip(result, {
           updateExistingHashes: true,
           throwOnWrongHashes: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/rljson",
-  "version": "0.0.39",
+  "version": "0.0.42",
   "packageManager": "pnpm@10.6.3",
   "description": "The RLJSON data format specification",
   "homepage": "https://github.com/rljson/rljson",
@@ -29,29 +29,29 @@
     "updateGoldens": "cross-env UPDATE_GOLDENS=true npm test"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
-    "@typescript-eslint/eslint-plugin": "^8.30.1",
-    "@typescript-eslint/parser": "^8.30.1",
-    "@vitest/coverage-v8": "^3.1.1",
+    "@types/node": "^22.15.2",
+    "@typescript-eslint/eslint-plugin": "^8.31.0",
+    "@typescript-eslint/parser": "^8.31.0",
+    "@vitest/coverage-v8": "^3.1.2",
     "cross-env": "^7.0.3",
-    "eslint": "^9.25.0",
-    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint": "^9.25.1",
+    "eslint-plugin-jsdoc": "^50.6.11",
     "eslint-plugin-tsdoc": "^0.4.0",
     "globals": "^16.0.0",
     "jsdoc": "^4.0.4",
     "read-pkg": "^9.0.1",
     "typescript": "~5.8.3",
-    "typescript-eslint": "^8.30.1",
-    "vite": "^6.3.2",
-    "vite-node": "^3.1.1",
+    "typescript-eslint": "^8.31.0",
+    "vite": "^6.3.3",
+    "vite-node": "^3.1.2",
     "vite-plugin-dts": "^4.5.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.1",
+    "vitest": "^3.1.2",
     "vitest-dom": "^0.1.1"
   },
   "dependencies": {
-    "@rljson/hash": "^0.0.13",
-    "@rljson/json": "^0.0.18"
+    "@rljson/hash": "^0.0.15",
+    "@rljson/json": "^0.0.21"
   },
   "pnpm": {
     "onlyBuiltDependencies": [