tsondb 0.21.5 → 0.21.8

package/dist/src/node/schema/index.d.ts

@@ -1,6 +1,6 @@
 import type { DeclarationName, DefaultTSONDBTypes, EntityName, SingletonEntityName } from "../index.ts";
-import type { Decl } from "./dsl/declarations/Decl.ts";
-import type { EntityDecl } from "./dsl/declarations/EntityDecl.ts";
+import { type Decl } from "./dsl/declarations/Decl.ts";
+import { type EntityDecl } from "./dsl/declarations/EntityDecl.ts";
 import type { SingletonEntityDecl } from "./dsl/index.ts";
 export declare class Schema<T extends DefaultTSONDBTypes = DefaultTSONDBTypes> {
     #private;

package/dist/src/node/schema/index.js

@@ -278,6 +278,7 @@ const checkChildEntityTypes = (localeEntity, decls) => {
     if (localeEntity && localeEntity.parentReferenceKey !== undefined) {
         throw new TypeError(`The locale entity "${localeEntity.name}" cannot be used as a child entity to other entities.`);
     }
+    // oxlint-disable-next-line no-warning-comments
     // TODO: Check that no cycles exist in child entity relations
     for (const decl of decls) {
         if (isEnumDecl(decl)) {
@@ -333,14 +334,14 @@ const isDeclarationRecursive = (declToCheck) => {
             case NodeKind.ArrayType:
                 return isDeclarationIncludedInNode(visitedDecls, node.items);
             case NodeKind.ObjectType:
-                return Object.entries(node.properties).some(([_, memberDecl]) => isDeclarationIncludedInNode(visitedDecls, memberDecl.type));
+                return Object.entries(node.properties).some(([_key, memberDecl]) => isDeclarationIncludedInNode(visitedDecls, memberDecl.type));
             case NodeKind.IncludeIdentifierType:
                 return (declToCheck === node.reference ||
                     isDeclarationIncludedInNode(visitedDecls, node.reference));
             case NodeKind.NestedEntityMapType:
                 return isDeclarationIncludedInNode(visitedDecls, node.type.value);
             case NodeKind.EnumType:
-                return Object.entries(node.values).some(([_, caseDecl]) => caseDecl.type !== null && isDeclarationIncludedInNode(visitedDecls, caseDecl.type));
+                return Object.entries(node.values).some(([_caseName, caseDecl]) => caseDecl.type !== null && isDeclarationIncludedInNode(visitedDecls, caseDecl.type));
             default:
                 return assertExhaustive(node);
         }
@@ -431,7 +432,7 @@ const checkSortOrders = (declarations) => {
                     });
                 }
             };
-            const sortOrder = decl.sortOrder;
+            const { sortOrder } = decl;
             if (sortOrder === "displayName") {
                 continue;
             }

package/dist/src/node/schema/treeOperations/format.js

@@ -1,4 +1,5 @@
 import { format as formatMarkdown, formatInline as formatMarkdownInline, } from "@elyukai/markdown/format";
+import { isNullish } from "@elyukai/utils/nullable";
 import { mapObject, sortObjectKeys, sortObjectKeysByIndex } from "@elyukai/utils/object";
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { ENUM_DISCRIMINATOR_KEY } from "../../../shared/schema/declarations/EnumDecl.js";
@@ -71,7 +72,7 @@ export const formatValue = (type, value, typeArguments, options) => {
                 const caseType = type.values[caseName]?.type;
                 return {
                     [ENUM_DISCRIMINATOR_KEY]: caseName,
-                    ...(caseValue == null || caseType == null
+                    ...(isNullish(caseValue) || isNullish(caseType)
                         ? {}
                         : { [caseName]: formatValue(caseType, caseValue, typeArguments, options) }),
                 };

package/dist/src/node/schema/treeOperations/serialization.d.ts

@@ -18,26 +18,26 @@ import type { SerializedReferenceIdentifierType } from "../../../shared/schema/t
 import type { SerializedStringType } from "../../../shared/schema/types/StringType.ts";
 import type { SerializedTranslationObjectType } from "../../../shared/schema/types/TranslationObjectType.ts";
 import type { SerializedTypeArgumentType } from "../../../shared/schema/types/TypeArgumentType.ts";
-import { type EntityDecl } from "../dsl/declarations/EntityDecl.ts";
-import { type EnumDecl } from "../dsl/declarations/EnumDecl.ts";
+import type { EntityDecl } from "../dsl/declarations/EntityDecl.ts";
+import type { EnumDecl } from "../dsl/declarations/EnumDecl.ts";
 import type { SingletonEntityDecl } from "../dsl/declarations/SingletonEntityDecl.ts";
-import { type TypeAliasDecl } from "../dsl/declarations/TypeAliasDecl.ts";
+import type { TypeAliasDecl } from "../dsl/declarations/TypeAliasDecl.ts";
 import type { Node, Type } from "../dsl/index.ts";
-import { type TypeParameter } from "../dsl/TypeParameter.ts";
-import { type ArrayType } from "../dsl/types/ArrayType.ts";
-import { type BooleanType } from "../dsl/types/BooleanType.ts";
-import { type ChildEntitiesType } from "../dsl/types/ChildEntitiesType.ts";
-import { type DateType } from "../dsl/types/DateType.ts";
-import { type EnumCaseDecl, type EnumType } from "../dsl/types/EnumType.ts";
-import { type FloatType } from "../dsl/types/FloatType.ts";
-import { type IncludeIdentifierType } from "../dsl/types/IncludeIdentifierType.ts";
-import { type IntegerType } from "../dsl/types/IntegerType.ts";
-import { type NestedEntityMapType } from "../dsl/types/NestedEntityMapType.ts";
-import { type MemberDecl, type ObjectType } from "../dsl/types/ObjectType.ts";
-import { type ReferenceIdentifierType } from "../dsl/types/ReferenceIdentifierType.ts";
-import { type StringType } from "../dsl/types/StringType.ts";
-import { type TranslationObjectType } from "../dsl/types/TranslationObjectType.ts";
-import { type TypeArgumentType } from "../dsl/types/TypeArgumentType.ts";
+import type { TypeParameter } from "../dsl/TypeParameter.ts";
+import type { ArrayType } from "../dsl/types/ArrayType.ts";
+import type { BooleanType } from "../dsl/types/BooleanType.ts";
+import type { ChildEntitiesType } from "../dsl/types/ChildEntitiesType.ts";
+import type { DateType } from "../dsl/types/DateType.ts";
+import type { EnumCaseDecl, EnumType } from "../dsl/types/EnumType.ts";
+import type { FloatType } from "../dsl/types/FloatType.ts";
+import type { IncludeIdentifierType } from "../dsl/types/IncludeIdentifierType.ts";
+import type { IntegerType } from "../dsl/types/IntegerType.ts";
+import type { NestedEntityMapType } from "../dsl/types/NestedEntityMapType.ts";
+import type { MemberDecl, ObjectType } from "../dsl/types/ObjectType.ts";
+import type { ReferenceIdentifierType } from "../dsl/types/ReferenceIdentifierType.ts";
+import type { StringType } from "../dsl/types/StringType.ts";
+import type { TranslationObjectType } from "../dsl/types/TranslationObjectType.ts";
+import type { TypeArgumentType } from "../dsl/types/TypeArgumentType.ts";
 export type SerializedNodeMap = {
     [NodeKind.EntityDecl]: [EntityDecl, SerializedEntityDecl];
     [NodeKind.SingletonEntityDecl]: [EntityDecl, SerializedSingletonEntityDecl];
@@ -68,7 +68,7 @@ export type SerializedMemberDeclObject<T extends Record<string, MemberDecl>> = {
 export type SerializedEnumCaseDeclObject<T extends Record<string, EnumCaseDecl>> = {
     [K in keyof T]: T[K] extends EnumCaseDecl<infer CT> ? SerializedEnumCaseDecl<CT extends Type ? Serialized<CT> : null> : never;
 };
-export type Serialized<T extends Node> = T extends EntityDecl<infer Name, infer T, infer FK> ? SerializedEntityDecl<Name, SerializedMemberDeclObject<T>, FK> : T extends SingletonEntityDecl<infer Name, infer T> ? SerializedSingletonEntityDecl<Name, SerializedMemberDeclObject<T>> : T extends EnumDecl<infer Name, infer T, infer Params> ? SerializedEnumDecl<Name, SerializedEnumCaseDeclObject<T>, SerializedTypeParameters<Params>> : T extends TypeAliasDecl<infer Name, infer T, infer Params> ? SerializedTypeAliasDecl<Name, Serialized<T>, SerializedTypeParameters<Params>> : T extends ArrayType<infer T> ? SerializedArrayType<Serialized<T>> : T extends ObjectType<infer T> ? SerializedObjectType<SerializedMemberDeclObject<T>> : T extends BooleanType ? SerializedBooleanType : T extends DateType ? SerializedDateType : T extends FloatType ? SerializedFloatType : T extends IntegerType ? SerializedIntegerType : T extends StringType ? SerializedStringType : T extends TypeArgumentType<infer T> ? SerializedTypeArgumentType<Serialized<T>> : T extends ReferenceIdentifierType ? SerializedReferenceIdentifierType : T extends IncludeIdentifierType<infer Params> ? SerializedIncludeIdentifierType<SerializedTypeParameters<Params>> : T extends NestedEntityMapType<infer Name, infer T> ? SerializedNestedEntityMapType<Name, SerializedMemberDeclObject<T>> : T extends EnumType<infer T> ? SerializedEnumType<SerializedEnumCaseDeclObject<T>> : T extends TypeParameter<infer N, infer C> ? SerializedTypeParameter<N, C extends Type ? Serialized<C> : undefined> : T extends ChildEntitiesType ? SerializedChildEntitiesType : T extends TranslationObjectType<infer E> ? SerializedTranslationObjectType<E> : never;
+export type Serialized<T extends Node> = T extends EntityDecl<infer Name, infer TC, infer FK> ? SerializedEntityDecl<Name, SerializedMemberDeclObject<TC>, FK> : T extends SingletonEntityDecl<infer Name, infer TC> ? SerializedSingletonEntityDecl<Name, SerializedMemberDeclObject<TC>> : T extends EnumDecl<infer Name, infer TC, infer Params> ? SerializedEnumDecl<Name, SerializedEnumCaseDeclObject<TC>, SerializedTypeParameters<Params>> : T extends TypeAliasDecl<infer Name, infer TC, infer Params> ? SerializedTypeAliasDecl<Name, Serialized<TC>, SerializedTypeParameters<Params>> : T extends ArrayType<infer TC> ? SerializedArrayType<Serialized<TC>> : T extends ObjectType<infer TC> ? SerializedObjectType<SerializedMemberDeclObject<TC>> : T extends BooleanType ? SerializedBooleanType : T extends DateType ? SerializedDateType : T extends FloatType ? SerializedFloatType : T extends IntegerType ? SerializedIntegerType : T extends StringType ? SerializedStringType : T extends TypeArgumentType<infer TC> ? SerializedTypeArgumentType<Serialized<TC>> : T extends ReferenceIdentifierType ? SerializedReferenceIdentifierType : T extends IncludeIdentifierType<infer Params> ? SerializedIncludeIdentifierType<SerializedTypeParameters<Params>> : T extends NestedEntityMapType<infer Name, infer TC> ? SerializedNestedEntityMapType<Name, SerializedMemberDeclObject<TC>> : T extends EnumType<infer TC> ? SerializedEnumType<SerializedEnumCaseDeclObject<TC>> : T extends TypeParameter<infer N, infer C> ? SerializedTypeParameter<N, C extends Type ? Serialized<C> : undefined> : T extends ChildEntitiesType ? SerializedChildEntitiesType : T extends TranslationObjectType<infer E> ? SerializedTranslationObjectType<E> : never;
 export type SerializedOf<T extends Node> = SerializedNodeMap[T["kind"]][1];
 export type Serializer<T extends Node = Node> = (node: T) => Serialized<T>;
 export declare const serializeNode: <T extends Node>(node: T) => Serialized<T>;

package/dist/src/node/schema/treeOperations/serialization.js

@@ -1,23 +1,5 @@
 import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { NodeKind } from "../../../shared/schema/Node.js";
-import {} from "../dsl/declarations/EntityDecl.js";
-import {} from "../dsl/declarations/EnumDecl.js";
-import {} from "../dsl/declarations/TypeAliasDecl.js";
-import {} from "../dsl/TypeParameter.js";
-import {} from "../dsl/types/ArrayType.js";
-import {} from "../dsl/types/BooleanType.js";
-import {} from "../dsl/types/ChildEntitiesType.js";
-import {} from "../dsl/types/DateType.js";
-import {} from "../dsl/types/EnumType.js";
-import {} from "../dsl/types/FloatType.js";
-import {} from "../dsl/types/IncludeIdentifierType.js";
-import {} from "../dsl/types/IntegerType.js";
-import {} from "../dsl/types/NestedEntityMapType.js";
-import {} from "../dsl/types/ObjectType.js";
-import {} from "../dsl/types/ReferenceIdentifierType.js";
-import {} from "../dsl/types/StringType.js";
-import {} from "../dsl/types/TranslationObjectType.js";
-import {} from "../dsl/types/TypeArgumentType.js";
 export const serializeNode = (node) => {
     switch (node.kind) {
         case NodeKind.EntityDecl: {

package/dist/src/node/schema/treeOperations/typeResolution.d.ts

@@ -6,19 +6,17 @@ import { TypeAliasDecl } from "../dsl/declarations/TypeAliasDecl.ts";
 import type { Node, Type } from "../dsl/index.ts";
 import type { TypeParameter } from "../dsl/TypeParameter.ts";
 import { ArrayType } from "../dsl/types/ArrayType.ts";
-import { type BooleanType } from "../dsl/types/BooleanType.ts";
-import { type ChildEntitiesType } from "../dsl/types/ChildEntitiesType.ts";
-import { type DateType } from "../dsl/types/DateType.ts";
-import type { EnumCaseDecl } from "../dsl/types/EnumType.ts";
-import { EnumType } from "../dsl/types/EnumType.ts";
-import { type FloatType } from "../dsl/types/FloatType.ts";
+import type { BooleanType } from "../dsl/types/BooleanType.ts";
+import type { ChildEntitiesType } from "../dsl/types/ChildEntitiesType.ts";
+import type { DateType } from "../dsl/types/DateType.ts";
+import { type EnumCaseDecl, EnumType } from "../dsl/types/EnumType.ts";
+import type { FloatType } from "../dsl/types/FloatType.ts";
 import { IncludeIdentifierType } from "../dsl/types/IncludeIdentifierType.ts";
-import { type IntegerType } from "../dsl/types/IntegerType.ts";
+import type { IntegerType } from "../dsl/types/IntegerType.ts";
 import { type NestedEntityMapType } from "../dsl/types/NestedEntityMapType.ts";
-import type { MemberDecl } from "../dsl/types/ObjectType.ts";
-import { ObjectType } from "../dsl/types/ObjectType.ts";
-import { type ReferenceIdentifierType } from "../dsl/types/ReferenceIdentifierType.ts";
-import { type StringType } from "../dsl/types/StringType.ts";
+import { type MemberDecl, ObjectType } from "../dsl/types/ObjectType.ts";
+import type { ReferenceIdentifierType } from "../dsl/types/ReferenceIdentifierType.ts";
+import type { StringType } from "../dsl/types/StringType.ts";
 import type { TranslationObjectType } from "../dsl/types/TranslationObjectType.ts";
 import { type TypeArgumentType } from "../dsl/types/TypeArgumentType.ts";
 export type NodeWithResolvedTypeArguments<T extends Node | null> = T extends BooleanType | DateType | FloatType | IntegerType | StringType | ReferenceIdentifierType | ChildEntitiesType | TranslationObjectType ? T : T extends EntityDecl<infer N, infer P, infer FK> ? EntityDecl<N, {

package/dist/src/node/schema/treeOperations/typeResolution.js

@@ -6,17 +6,10 @@ import { EnumDecl } from "../dsl/declarations/EnumDecl.js";
 import { SingletonEntityDecl } from "../dsl/declarations/SingletonEntityDecl.js";
 import { isTypeAliasDecl, TypeAliasDecl } from "../dsl/declarations/TypeAliasDecl.js";
 import { ArrayType } from "../dsl/types/ArrayType.js";
-import {} from "../dsl/types/BooleanType.js";
-import {} from "../dsl/types/ChildEntitiesType.js";
-import {} from "../dsl/types/DateType.js";
 import { EnumType } from "../dsl/types/EnumType.js";
-import {} from "../dsl/types/FloatType.js";
 import { IncludeIdentifierType, isIncludeIdentifierType, isNoGenericIncludeIdentifierType, } from "../dsl/types/IncludeIdentifierType.js";
-import {} from "../dsl/types/IntegerType.js";
 import { _NestedEntityMapType } from "../dsl/types/NestedEntityMapType.js";
 import { ObjectType } from "../dsl/types/ObjectType.js";
-import {} from "../dsl/types/ReferenceIdentifierType.js";
-import {} from "../dsl/types/StringType.js";
 import { isTypeArgumentType } from "../dsl/types/TypeArgumentType.js";
 export const resolveTypeArguments = (args, node, inDecl) => {
     switch (node.kind) {

package/dist/src/node/schema/treeOperations/validation.d.ts

@@ -1,5 +1,5 @@
 import type { ValidationOptions } from "../../index.ts";
-import { type DatabaseInMemory } from "../../utils/databaseInMemory.ts";
+import type { DatabaseInMemory } from "../../utils/databaseInMemory.ts";
 import { type Decl } from "../dsl/declarations/Decl.ts";
 import type { Type } from "../dsl/index.ts";
 import type { AnyEntityMap } from "../generatedTypeHelpers.ts";

package/dist/src/node/schema/treeOperations/validation.js

@@ -12,7 +12,6 @@ import { validateDateConstraints } from "../../../shared/validation/date.js";
 import { validateNumberConstraints } from "../../../shared/validation/number.js";
 import { validateObjectConstraints, validateObjectRangeConstraints, validateUnknownKeys, } from "../../../shared/validation/object.js";
 import { validateStringConstraints } from "../../../shared/validation/string.js";
-import {} from "../../utils/databaseInMemory.js";
 import { entity, json, key } from "../../utils/errorFormatting.js";
 import { getTypeArgumentsRecord } from "../dsl/declarations/Decl.js";
 import { createEntityIdentifierType } from "../dsl/declarations/EntityDecl.js";
@@ -50,7 +49,7 @@ const validateTranslationObjectStructuralIntegrity = (context, allKeysAreRequire
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
         return [TypeError(`expected an object, but got ${json(value, context.useStyling)}`)];
     }
-    const expectedKeys = Object.keys(type).filter(key => type[key] !== undefined);
+    const expectedKeys = Object.keys(type).filter(transKey => type[transKey] !== undefined);
     return parallelizeErrors([
         ...validateUnknownKeys(expectedKeys, Object.keys(value)),
         ...expectedKeys.map(propName => {
@@ -99,12 +98,12 @@ const createStructuralAttributedStringKeyValidator = (validationOptions) => {
     const { checkInstanceReferencesInAttributedStrings: checkAttrRefs, checkAttributedStringKeys } = validationOptions.markdown ?? {};
     if (checkAttributedStringKeys !== undefined) {
         const generalTest = Array.isArray(checkAttributedStringKeys)
-            ? key => checkAttributedStringKeys.includes(key)
-            : key => checkAttributedStringKeys.test(key);
+            ? attr => checkAttributedStringKeys.includes(attr)
+            : attr => checkAttributedStringKeys.test(attr);
         if (checkAttrRefs === true || typeof checkAttrRefs === "object") {
             const { entityKey, instanceKey } = normalizeAttributedStringReferenceKeys(checkAttrRefs);
             const additionalValidKeys = [entityKey, instanceKey];
-            return key => generalTest(key) || additionalValidKeys.includes(key);
+            return attr => generalTest(attr) || additionalValidKeys.includes(attr);
         }
         return generalTest;
     }
@@ -264,7 +263,7 @@ export const validateTypeStructuralIntegrity = (helpers, inDecls, type, value) =
                 return unknownKeyErrors;
             }
             const associatedType = type.values[caseName]?.type;
-            if (associatedType != null) {
+            if (isNotNullish(associatedType)) {
                 if (!(caseName in value)) {
                     return [
                         TypeError(`missing required associated value for case ${key(`"${caseName}"`, helpers.useStyling)}`),

package/dist/src/node/schema/validation/options.js

@@ -1,3 +1,4 @@
+import { isNotNullish } from "@elyukai/utils/nullable";
 export class OptionError extends Error {
     constructor(message) {
         super(message);
@@ -5,7 +6,7 @@ export class OptionError extends Error {
     }
 }
 export const validateOption = (value, name, validator) => {
-    if (value == null || validator(value)) {
+    if (!isNotNullish(value) || validator(value)) {
         return value;
     }
     throw new OptionError(`Invalid value for "${name}": ${JSON.stringify(value)}`);

package/dist/src/node/server/api/declarations.js

@@ -208,7 +208,7 @@ declarationsApi.get("/:name/instances/:id", (req, res) => {
         return;
     }
     const body = {
-        instance: instance,
+        instance,
         isLocaleEntity: decl === req.db.schema.localeEntity,
     };
     res.json(body);
@@ -289,7 +289,7 @@ declarationsApi.get("/:name/instance", (req, res) => {
         return;
     }
     const body = {
-        instance: instance,
+        instance,
     };
     res.json(body);
 });

package/dist/src/node/server/api/git.js

@@ -178,7 +178,7 @@ gitApi.post("/reset/:entityName/:instanceId", async (req, res) => {
     }
 });
 gitApi.post("/commit", async (req, res) => {
-    const message = req.body.message;
+    const { message } = req.body;
     if (typeof message !== "string" || message.length === 0) {
         res.set("Content-Type", "text/plain");
         res.status(400).send("Invalid commit message");
@@ -225,7 +225,7 @@ gitApi.get("/branch", async (req, res) => {
     res.json(body);
 });
 gitApi.post("/branch", async (req, res) => {
-    const branchName = req.body.branchName;
+    const { branchName } = req.body;
     if (typeof branchName !== "string" || branchName.length === 0) {
         res.set("Content-Type", "text/plain");
         res.status(400).send("Invalid branch name");

package/dist/src/node/server/index.d.ts

@@ -1,5 +1,5 @@
 import type { HomeLayoutSection, ServerConfig } from "../config.ts";
-import type { TSONDB, ValidationOptions } from "../index.ts";
+import type { DefaultTSONDBTypes, TSONDB, ValidationOptions } from "../index.ts";
 export type ServerOptions = {
     port: number;
 };
@@ -16,4 +16,4 @@ declare global {
         }
     }
 }
-export declare const createServer: (db: TSONDB, config: Omit<ServerConfig, "locales">) => void;
+export declare const createServer: <T extends DefaultTSONDBTypes = DefaultTSONDBTypes>(db: TSONDB<T>, config: Omit<ServerConfig<T>, "locales">) => void;

package/dist/src/node/server/index.js

@@ -31,7 +31,7 @@ export const createServer = (db, config) => {
     app.use(express.json());
     const defaultLocales = db.locales;
     const requestLocals = {
-        db,
+        db: db,
         defaultLocales,
         locales: defaultLocales,
         homeLayoutSections,
@@ -57,7 +57,7 @@ export const createServer = (db, config) => {
     if (customAssetsPath) {
         app.use("/assets/custom", express.static(customAssetsPath));
     }
-    app.get(/^\/.*/, (_req, res) => {
+    app.get(/^\/.*/u, (_req, res) => {
         res.send(`<!DOCTYPE html>
 <html lang="en">
 <head>

package/dist/src/node/server/utils/query.js

@@ -3,5 +3,5 @@ export const getQueryParamString = (parsedQueryString, key) => {
     if (typeof value === "string") {
         return value;
     }
-    return;
+    return undefined;
 };

package/dist/src/node/transaction.d.ts

@@ -1,7 +1,7 @@
 import type { InstanceContainer, InstanceContent, SingletonInstanceContainer } from "../shared/utils/instances.ts";
-import { type EntityDecl, type SingletonEntityDecl } from "./schema/dsl/index.ts";
+import type { EntityDecl, SingletonEntityDecl } from "./schema/dsl/index.ts";
 import type { AnyEntityMap, AnySingletonEntityMap, GetEntityByName, GetSingletonEntityByName, RegisteredEntityMap, RegisteredSingletonEntityMap } from "./schema/generatedTypeHelpers.ts";
-import { type DatabaseInMemory } from "./utils/databaseInMemory.ts";
+import type { DatabaseInMemory } from "./utils/databaseInMemory.ts";
 import { type ReferencesToInstances } from "./utils/references.ts";
 export type TransactionStep = {
     kind: "create";

package/dist/src/node/transaction.js

@@ -2,8 +2,6 @@ import { isEmpty } from "@elyukai/utils/array/nonEmpty";
 import { randomUUID } from "node:crypto";
 import { getSortOrderKeyPathForReorder } from "../shared/schema/utils/sortOrder.js";
 import { getErrorMessageForDisplay, HTTPError } from "../shared/utils/error.js";
-import {} from "./schema/dsl/index.js";
-import {} from "./utils/databaseInMemory.js";
 import { isReferencedByOtherInstances, updateReferencesToInstances, } from "./utils/references.js";
 import { getSortOrderStartIndex } from "./utils/sortOrder.js";
 export const createNewId = () => randomUUID();

package/dist/src/node/utils/childInstances.d.ts

@@ -3,7 +3,7 @@ import type { InstanceContainer } from "../../shared/utils/instances.ts";
 import type { TSONDB } from "../index.ts";
 import type { EntityDecl, EntityDeclWithParentReference } from "../schema/dsl/declarations/EntityDecl.ts";
 import type { Transaction } from "../transaction.ts";
-import { type DatabaseInMemory } from "./databaseInMemory.ts";
+import type { DatabaseInMemory } from "./databaseInMemory.ts";
 export declare const getChildInstancesFromEntity: (databaseInMemory: DatabaseInMemory, parentEntity: EntityDecl, parentId: string, childEntity: EntityDeclWithParentReference) => InstanceContainer[];
 export declare const getChildInstances: (db: TSONDB, parentEntity: EntityDecl, parentId: string, recursive?: boolean) => EntityTaggedInstanceContainerWithChildInstances[];
 export declare const saveInstanceTree: (txn: Transaction, getEntity: (entityName: string) => EntityDecl | undefined, parentEntityName: string | undefined, parentId: string | undefined, entityName: string, oldInstance: EntityTaggedInstanceContainerWithChildInstances | undefined, newInstance: UnsafeEntityTaggedInstanceContainerWithChildInstances | undefined, customId: string | undefined) => [Transaction, InstanceContainer];

package/dist/src/node/utils/childInstances.js

@@ -1,14 +1,13 @@
 import { hasKey } from "@elyukai/utils/object";
 import { error, isError, ok } from "@elyukai/utils/result";
+import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { createEnumCaseValue, ENUM_DISCRIMINATOR_KEY, } from "../../shared/schema/declarations/EnumDecl.js";
 import { NodeKind } from "../../shared/schema/Node.js";
 import { HTTPError } from "../../shared/utils/error.js";
-import {} from "../schema/dsl/index.js";
 import { isChildEntitiesType } from "../schema/dsl/types/ChildEntitiesType.js";
 import { Case } from "../schema/generatedTypeHelpers.js";
 import { isEntityDeclWithParentReference, isEnumDecl, isIncludeIdentifierType, isReferenceIdentifierType, } from "../schema/guards.js";
 import { reduceNodes } from "../schema/helpers.js";
-import {} from "./databaseInMemory.js";
 const isParentReferenceReferencingParent = (value, parentEntityName, parentId) => {
     if (typeof value === "object" && value !== null && hasKey(value, ENUM_DISCRIMINATOR_KEY)) {
         return (value[ENUM_DISCRIMINATOR_KEY] === parentEntityName &&
@@ -33,6 +32,8 @@ const getParentReferenceTypeAux = (type) => {
                 return "enum";
             case NodeKind.TypeAliasDecl:
                 return getParentReferenceTypeAux(type.reference.type.value);
+            default:
+                return assertExhaustive(type.reference);
         }
     }
     else if (isReferenceIdentifierType(type)) {

package/dist/src/node/utils/customConstraints.d.ts

@@ -1,7 +1,7 @@
 import { type Result } from "@elyukai/utils/result";
 import type { InstanceContent } from "../../shared/utils/instances.ts";
 import type { DefaultTSONDBTypes, EntityName, SingletonEntityName } from "../index.ts";
-import { type EntityDecl, type SingletonEntityDecl } from "../schema/dsl/index.ts";
+import type { EntityDecl, SingletonEntityDecl } from "../schema/dsl/index.ts";
 import type { AnyChildEntityMap, AnyEntityMap, AnySingletonEntityMap, GetAllChildInstanceContainersForParent, GetAllInstanceContainers, GetAllInstances, GetDisplayName, GetDisplayNameAndId, GetEntityByName, GetInstanceById, GetInstanceOverviewOfEntityById, GetSingletonInstance, RegisteredChildEntityMap, RegisteredEntity, RegisteredEntityMap, RegisteredEnumOrTypeAlias, RegisteredSingletonEntityMap } from "../schema/generatedTypeHelpers.ts";
 import type { DatabaseInMemory } from "./databaseInMemory.ts";
 export type CustomConstraintHelpers<EM extends AnyEntityMap = RegisteredEntityMap, CEM extends AnyChildEntityMap = RegisteredChildEntityMap, SEM extends AnySingletonEntityMap = RegisteredSingletonEntityMap> = {

package/dist/src/node/utils/customConstraints.js

@@ -1,6 +1,5 @@
 import { error, isError, mapError, ok } from "@elyukai/utils/result";
 import { NodeKind } from "../../shared/schema/Node.js";
-import {} from "../schema/dsl/index.js";
 import { checkCustomConstraintsInEntityDecl, checkCustomConstraintsInSingletonEntityDecl, } from "../schema/treeOperations/customConstraints.js";
 const collectErrorsForEntity = (data, entity, getInstanceOverviewOfEntityById, helpers) => {
     switch (entity.kind) {

package/dist/src/node/utils/databaseInMemory.js

@@ -15,7 +15,7 @@ import { HTTPError } from "../../shared/utils/error.js";
 import { normalizedIdArgs, } from "../schema/generatedTypeHelpers.js";
 import { getPathToSingletonInstance, readSingletonInstance } from "./files.js";
 const exec = promisify(child_process.exec);
-const ulimit = platform === "win32" ? 2048 : Number.parseInt((await exec("ulimit -n")).stdout);
+const ulimit = platform === "win32" ? 2048 : Number.parseInt((await exec("ulimit -n")).stdout, 10);
 export class DatabaseInMemory {
     #data;
     #singletonData;
@@ -142,9 +142,7 @@ export class DatabaseInMemory {
         const parentKey = entity.parentReferenceKey;
         return this.getAllInstanceContainersOfEntity(childEntityName).filter(instance => deepEqual(instance.content[parentKey], parentId));
     };
-    getAllChildInstancesForParent = (getEntityByName, childEntityName, parentId) => {
-        return this.getAllChildInstanceContainersForParent(getEntityByName, childEntityName, parentId).map(container => container.content);
-    };
+    getAllChildInstancesForParent = (getEntityByName, childEntityName, parentId) => this.getAllChildInstanceContainersForParent(getEntityByName, childEntityName, parentId).map(container => container.content);
     setInstanceContainerOfEntityById(entityName, instance) {
         const instances = this.#data.get(entityName) ?? Dictionary.empty;
         return [
@@ -159,20 +157,20 @@ export class DatabaseInMemory {
         ];
     }
     deleteInstanceContainerOfEntityById(entityName, instanceId) {
-        const instances = this.#data.get(entityName) ?? Dictionary.empty;
-        const oldInstance = instances.get(instanceId);
-        return oldInstance
-            ? [
-                new DatabaseInMemory(this.#data.modify(entityName, instances => {
-                    if (instances === undefined) {
-                        return instances;
-                    }
-                    const remainingInstances = instances.remove(instanceId);
-                    return remainingInstances.size === 0 ? undefined : remainingInstances;
-                }), this.#singletonData),
+        const instances = this.#data.get(entityName);
+        const oldInstance = instances?.get(instanceId);
+        if (oldInstance !== undefined) {
+            const remainingInstances = instances?.remove(instanceId) ?? Dictionary.empty;
+            return [
+                remainingInstances.size === 0
+                    ? new DatabaseInMemory(this.#data.remove(entityName), this.#singletonData)
+                    : new DatabaseInMemory(this.#data.set(entityName, remainingInstances), this.#singletonData),
                 oldInstance.content,
-            ]
-            : [this, undefined];
+            ];
+        }
+        else {
+            return [this, undefined];
+        }
     }
     deleteInstanceContainerOfSingletonEntity(entityName) {
         const oldInstance = this.#singletonData.get(entityName);
@@ -209,7 +207,7 @@ export class DatabaseInMemory {
     }
     reorderInstanceOfEntity(entityName, keyPath, instanceId, newIndex, startIndex = 0) {
         const instancesWithPositions = this.getAllInstanceContainersOfEntity(entityName).map(instance => [instance.id, getValueAtKeyPathIfDefined(instance.content, keyPath)]);
-        const normalizedInstancesWithPositions = instancesWithPositions.toSorted(on(([_, position]) => position, compareNumber));
+        const normalizedInstancesWithPositions = instancesWithPositions.toSorted(on(([_id, position]) => position, compareNumber));
         const currentIndex = normalizedInstancesWithPositions.findIndex(([id]) => id === instanceId);
         if (currentIndex === -1) {
             throw new HTTPError(400, `Instance with ID "${instanceId}" does not exist in entity "${entityName}"`);

package/dist/src/node/utils/databaseOnDisk.js

@@ -1,8 +1,10 @@
 import { error, ok } from "@elyukai/utils/result";
+import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import * as DatabaseFilesystem from "./files.js";
 const rollbackChanges = async (root, steps, formatterOptions) => {
     for (const step of steps) {
         try {
+            // oxlint-disable-next-line no-await-in-loop
             await runReverseStepAction(root, step, formatterOptions);
         }
         catch (e) {
@@ -23,6 +25,8 @@ const runStepAction = (root, step, formatterOptions) => {
             return DatabaseFilesystem.writeSingletonInstance(root, step.entity, step.instanceContent, formatterOptions);
         case "deleteSingleton":
             return DatabaseFilesystem.deleteSingletonInstance(root, step.entity.name);
+        default:
+            return assertExhaustive(step);
     }
 };
 const runReverseStepAction = (root, step, formatterOptions) => {
@@ -39,6 +43,8 @@ const runReverseStepAction = (root, step, formatterOptions) => {
             return DatabaseFilesystem.writeSingletonInstance(root, step.entity, step.oldInstance, formatterOptions);
         case "deleteSingleton":
             return DatabaseFilesystem.writeSingletonInstance(root, step.entity, step.oldInstance, formatterOptions);
+        default:
+            return assertExhaustive(step);
     }
 };
 export const applyStepsToDisk = async (root, steps, formatterOptions) => {
@@ -46,9 +52,11 @@ export const applyStepsToDisk = async (root, steps, formatterOptions) => {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const step = steps[i];
         try {
+            // oxlint-disable-next-line no-await-in-loop
             await runStepAction(root, step, formatterOptions);
         }
         catch (e) {
+            // oxlint-disable-next-line no-await-in-loop
             await rollbackChanges(root, steps.slice(0, i), formatterOptions);
             return error(e);
         }

package/dist/src/node/utils/displayName.d.ts

@@ -2,7 +2,7 @@ import { type DisplayNameResult } from "../../shared/utils/displayName.ts";
 import type { InstanceContainer, InstanceContainerOverview, InstanceContent } from "../../shared/utils/instances.ts";
 import type { EntityDecl } from "../schema/dsl/declarations/EntityDecl.ts";
 import { type AnyChildEntityMap, type AnyEntityMap, type GetAllChildInstanceContainersForParent, type GetDisplayNameWithLocaleId, type GetEntityByName, type GetInstanceById, type GetInstanceContainerById, type IdArgsVariant, type RegisteredChildEntityMap, type RegisteredEntity, type RegisteredEntityMap } from "../schema/generatedTypeHelpers.js";
-import { type DatabaseInMemory } from "./databaseInMemory.ts";
+import type { DatabaseInMemory } from "./databaseInMemory.ts";
 export type GetChildInstancesForInstanceId = (parentEntityName: string, parentId: string, childEntityName: string) => {
     id: string;
     content: InstanceContent;

package/dist/src/node/utils/displayName.js

@@ -2,7 +2,6 @@ import { sortBySortOrder } from "../../shared/schema/utils/sortOrder.js";
 import { getSerializedDisplayNameFromEntityInstance, } from "../../shared/utils/displayName.js";
 import { normalizedIdArgs, } from "../schema/generatedTypeHelpers.js";
 import { serializeNode } from "../schema/treeOperations/serialization.js";
-import {} from "./databaseInMemory.js";
 export const getDisplayNameFromEntityInstance = (entity, instanceContainer, getEntityByName, getInstanceById, getAllChildInstancesForParent, locales, defaultName = "", useCustomizer = true) => {
     const instanceDisplayNameCustomizer = entity.instanceDisplayNameCustomizer;
     if (useCustomizer && instanceDisplayNameCustomizer) {
@@ -17,9 +16,9 @@ export const getDisplayNameFromEntityInstance = (entity, instanceContainer, getE
             getDisplayNameForInstanceId: (...args) => {
                 const instance = getInstanceById(...args);
                 const { entityName } = normalizedIdArgs(args);
-                const entity = getEntityByName(entityName);
-                if (instance && entity) {
-                    return getDisplayNameFromEntityInstance(entity, instance, getEntityByName, getInstanceById, getAllChildInstancesForParent, locales, instance.id);
+                const entityOfInstance = getEntityByName(entityName);
+                if (instance && entityOfInstance) {
+                    return getDisplayNameFromEntityInstance(entityOfInstance, instance, getEntityByName, getInstanceById, getAllChildInstancesForParent, locales, instance.id);
                 }
                 else {
                     return undefined;
@@ -47,28 +46,24 @@ export const getInstanceOverview = (getInstanceById, getAllChildInstancesForPare
         gitStatus: instance.gitStatus,
     };
 };
-export const getInstanceOverviewsByEntityName = (getInstanceById, getAllChildInstancesForParent, getEntityByName, entity, instances, locales) => {
-    return sortBySortOrder(instances.map((instance) => {
-        const { name, localeId } = getDisplayNameFromEntityInstance(entity, instance, getEntityByName, getInstanceById, getAllChildInstancesForParent, locales);
-        return [
-            instance,
-            {
-                id: instance.id,
-                displayName: name,
-                displayNameLocaleId: localeId,
-                gitStatus: instance.gitStatus,
-            },
-        ];
-    }), entity.sortOrder).map(arr => arr[1]);
-};
-export const getAllInstanceOverviewsByEntityName = (getEntityByName, databaseInMemory, locales) => {
-    return Object.fromEntries(databaseInMemory.getAllInstances().map(([entityName, instances]) => {
-        const entity = getEntityByName(entityName);
-        return [
-            entityName,
-            getInstanceOverviewsByEntityName(databaseInMemory.getInstanceContainerOfEntityById.bind(databaseInMemory), databaseInMemory.getAllChildInstanceContainersForParent.bind(databaseInMemory, getEntityByName), getEntityByName, 
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            entity, instances, locales),
-        ];
-    }));
-};
+export const getInstanceOverviewsByEntityName = (getInstanceById, getAllChildInstancesForParent, getEntityByName, entity, instances, locales) => sortBySortOrder(instances.map((instance) => {
+    const { name, localeId } = getDisplayNameFromEntityInstance(entity, instance, getEntityByName, getInstanceById, getAllChildInstancesForParent, locales);
+    return [
+        instance,
+        {
+            id: instance.id,
+            displayName: name,
+            displayNameLocaleId: localeId,
+            gitStatus: instance.gitStatus,
+        },
+    ];
+}), entity.sortOrder).map(arr => arr[1]);
+export const getAllInstanceOverviewsByEntityName = (getEntityByName, databaseInMemory, locales) => Object.fromEntries(databaseInMemory.getAllInstances().map(([entityName, instances]) => {
+    const entity = getEntityByName(entityName);
+    return [
+        entityName,
+        getInstanceOverviewsByEntityName(databaseInMemory.getInstanceContainerOfEntityById.bind(databaseInMemory), databaseInMemory.getAllChildInstanceContainersForParent.bind(databaseInMemory, getEntityByName), getEntityByName, 
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        entity, instances, locales),
+    ];
+}));

package/dist/src/node/utils/files.d.ts

@@ -1,6 +1,6 @@
 import type { InstanceContent } from "../../shared/utils/instances.ts";
 import type { FormatterOptions } from "../config.ts";
-import { type EntityDecl, type SingletonEntityDecl } from "../schema/dsl/index.ts";
+import type { EntityDecl, SingletonEntityDecl } from "../schema/dsl/index.ts";
 export declare const getFileNameForId: (id: string) => string;
 export declare const getSingletonFileName: (entityName: string) => string;
 export declare const getPathToInstance: (dataRoot: string, entityName: string, id: string) => string;