@rljson/rljson 0.0.47 → 0.0.49

package/dist/content/buffet.d.ts

@@ -31,5 +31,5 @@ export interface Buffet extends Json {
 /**
  * A table containing buffets
  */
-export type BuffetsTable = RljsonTable<Buffet, 'buffets'>;
+export type BuffetsTable = RljsonTable<Buffet>;
 export declare const exampleBuffetsTable: () => BuffetsTable;

package/dist/content/cake.d.ts

@@ -42,7 +42,7 @@ export interface Cake extends Json {
 /**
  * A table containing cakes
  */
-export type CakesTable = RljsonTable<Cake, 'cakes'>;
+export type CakesTable = RljsonTable<Cake>;
 /**
  * Provides an example cakes table for test purposes
  */

package/dist/content/ingredients.d.ts

@@ -8,7 +8,7 @@ export type IngredientsRef = Ref;
 /**
  * A table containing ingredients
  */
-export type IngredientsTable<T extends JsonWithId> = RljsonTable<T, 'ingredients'>;
+export type IngredientsTable<T extends JsonWithId> = RljsonTable<T>;
 /**
  * Provides an example ingredients table for test purposes
  */

package/dist/content/layer.d.ts

@@ -36,7 +36,7 @@ export interface Layer extends Json {
 /**
  * A table containing layers
  */
-export type LayersTable = RljsonTable<Layer, 'layers'>;
+export type LayersTable = RljsonTable<Layer>;
 /**
  * Provides an example layersTable for test purposes
  */

package/dist/content/revision.d.ts

@@ -30,7 +30,7 @@ export interface Revision extends Json {
 /**
  * A table containing revisions
  */
-export type RevisionsTable = RljsonTable<Revision, 'ingredients'>;
+export type RevisionsTable = RljsonTable<Revision>;
 /**
  * Example revision object for test purposes
  */

package/dist/content/slice-ids.d.ts

@@ -25,7 +25,7 @@ export interface SliceIds extends Json {
 /**
  * A table containing slice ids
  */
-export type SliceIdsTable = RljsonTable<SliceIds, 'sliceIds'>;
+export type SliceIdsTable = RljsonTable<SliceIds>;
 /**
  * Returns one of the layers of the example cake
  */

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

@@ -66,7 +66,7 @@ export interface TableCfg extends Json {
 /**
  * A table containing columns
  */
-export type TablesCfgTable = RljsonTable<TableCfg, 'ingredients'>;
+export type TablesCfgTable = RljsonTable<TableCfg>;
 /**
  * Throws an error if the table configuration is not valid.
  * @param tableCfg - The table configuration to check

package/dist/rljson.d.ts

@@ -6,7 +6,7 @@ import { LayersTable } from './content/layer.ts';
 import { RevisionsTable } from './content/revision.ts';
 import { SliceIdsTable } from './content/slice-ids.ts';
 import { TableCfgRef, TablesCfgTable } from './content/table-cfg.ts';
-import { ContentType, Ref, TableKey } from './typedefs.ts';
+import { Ref, TableKey } from './typedefs.ts';
 export declare const reservedFieldNames: string[];
 export declare const reservedTableKeys: string[];
 /**
@@ -45,11 +45,9 @@ export type RljsonPrivate = {
 /** An example rljson object */
 export declare const exampleRljson: () => Rljson;
 /** A table in the rljson format */
-export interface RljsonTable<Data extends Json, Type extends ContentType> extends Json {
+export interface RljsonTable<Data extends Json> extends Json {
     /** The data rows of the table */
     _data: Data[];
-    /**  The type of the table. If not set, the type is "ingredients" */
-    _type: Type;
     /** The columns configuration of the table */
     _tableCfg?: TableCfgRef;
 }

package/dist/rljson.js

@@ -573,6 +573,10 @@ const validateRljsonAgainstTableCfg = (rows, tableCfg) => {
         continue;
       }
       const expectedType = columnCfg.type;
+      const value = row[columnKey];
+      if (value === void 0 || value === null) {
+        continue;
+      }
       const actualType = jsonValueType(row[columnKey]);
       if (expectedType !== actualType) {
         errors.push(
@@ -747,14 +751,12 @@ class _BaseValidator {
       () => this._columnNamesNotLowerCamelCase(),
       () => this._dataNotFound(),
       () => this._dataHasWrongType(),
-      () => this._invalidTableTypes(),
       // Check table cfg
       () => this._tableCfgsReferencedTableKeyNotFound(),
       () => this._tableCfgsHaveWrongType(),
       () => this._tableCfgNotFound(),
       () => this._missingColumnConfigs(),
       () => this._dataDoesNotMatchColumnConfig(),
-      () => this._tableTypesDoNotMatch(),
       () => this._tableCfgHasRootHeadSharedError(),
       () => this._rootOrHeadTableHasNoIdColumn(),
       // Check references
@@ -1037,35 +1039,6 @@ class _BaseValidator {
     }
   }
   // ...........................................................................
-  _tableTypesDoNotMatch() {
-    const rljson = this.rljson;
-    const tablesWithTypeMissmatch = [];
-    for (const tableKey of this.tableKeys) {
-      const table = rljson[tableKey];
-      const cfgRef = table._tableCfg;
-      if (!cfgRef) {
-        continue;
-      }
-      const cfg = this.rljsonIndexed.tableCfgs._data[cfgRef];
-      const typeShould = cfg.type;
-      const typeIs = table._type;
-      if (typeShould !== typeIs) {
-        tablesWithTypeMissmatch.push({
-          table: tableKey,
-          typeInTable: typeIs,
-          typeInConfig: typeShould,
-          tableCfg: cfgRef
-        });
-      }
-    }
-    if (tablesWithTypeMissmatch.length > 0) {
-      this.errors.tableTypesDoNotMatch = {
-        error: "Table types do not match table config",
-        tables: tablesWithTypeMissmatch
-      };
-    }
-  }
-  // ...........................................................................
   _tableCfgHasRootHeadSharedError() {
     const rljson = this.rljson;
     const inconsistentTableCfgs = [];
@@ -1154,27 +1127,6 @@ class _BaseValidator {
     }
   }
   // ...........................................................................
-  _invalidTableTypes() {
-    const rljson = this.rljson;
-    const tablesWithWrongType = [];
-    for (const tableKey of this.tableKeys) {
-      const table = rljson[tableKey];
-      const type = table._type;
-      if (contentTypes.indexOf(type) === -1) {
-        tablesWithWrongType.push({
-          table: tableKey,
-          type,
-          allowedTypes: contentTypes.join(" | ")
-        });
-      }
-    }
-    if (tablesWithWrongType.length > 0) {
-      this.errors.invalidTableTypes = {
-        error: "Tables with invalid types",
-        tables: tablesWithWrongType
-      };
-    }
-  }
   _refsNotFound() {
     const missingRefs = [];
     iterateTablesSync(this.rljson, (tableKey, table) => {

package/dist/validate/base-validator.d.ts

@@ -9,7 +9,6 @@ export interface BaseErrors extends Errors {
     hashesNotValid?: Json;
     dataNotFound?: Json;
     dataHasWrongType?: Json;
-    invalidTableTypes?: Json;
     tableCfgsReferencedTableKeyNotFound?: Json;
     columnsHaveWrongType?: Json;
     tableCfgReferencedNotFound?: Json;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/rljson",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "packageManager": "pnpm@10.6.3",
   "description": "The RLJSON data format specification",
   "homepage": "https://github.com/rljson/rljson",