tsondb 0.19.11 → 0.19.12

package/dist/src/{bin → node/bin}/tsondb.js

@@ -15,9 +15,9 @@ import { cwd } from "node:process";
 import { pathToFileURL } from "node:url";
 import { styleText } from "node:util";
 import { parseArguments } from "simple-cli-args";
-import { validateConfigForData, validateConfigForGeneration, validateConfigForServer, validateConfigForTesting, } from "../node/config.js";
-import { TSONDB } from "../node/index.js";
-import { createServer } from "../node/server/index.js";
+import { validateConfigForData, validateConfigForGeneration, validateConfigForServer, validateConfigForTesting, } from "../config.js";
+import { TSONDB } from "../index.js";
+import { createServer } from "../server/index.js";
 const debug = Debug("tsondb:cli");
 const passedArguments = parseArguments({
     commands: {
@@ -120,7 +120,7 @@ else {
             debug(`running command: serve`);
             validateConfigForServer(config);
             const db = await createDB(config, config.validationOptions, false);
-            await createServer(db, config.homeLayoutSections, config.serverOptions, config.validationOptions, config.customStylesheetPath);
+            createServer(db, config.homeLayoutSections, config.serverOptions, config.validationOptions, config.customStylesheetPath, config.customAssetsPath);
             break;
         }
         case "validate": {

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

@@ -1,5 +1,5 @@
-import type { Output } from "../shared/output.ts";
 import type { DefaultTSONDBTypes, ValidationOptions } from "./index.ts";
+import type { Output } from "./output.ts";
 import type { EntityDecl } from "./schema/dsl/index.ts";
 import type { Schema } from "./schema/index.ts";
 /**
@@ -16,6 +16,7 @@ export type Config<T extends DefaultTSONDBTypes = DefaultTSONDBTypes> = {
     dataRootPath?: string;
     homeLayoutSections?: HomeLayoutSection[];
     customStylesheetPath?: string;
+    customAssetsPath?: string;
     validationOptions?: Partial<ValidationOptions>;
 };
 export type ServerOptions = {
@@ -51,6 +52,7 @@ export type ServerConfig = DataConfig & {
     homeLayoutSections?: HomeLayoutSection[];
     validationOptions?: Partial<ValidationOptions>;
     customStylesheetPath?: string;
+    customAssetsPath?: string;
 };
 /**
  * The configuration type required for validating the contents of the database.

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

@@ -1,6 +1,6 @@
-import type { Output } from "../shared/output.ts";
 import type { InstanceContainer, InstanceContainerOverview } from "../shared/utils/instances.ts";
 import { Git } from "./git.js";
+import type { Output } from "./output.ts";
 import { type EntityDecl } from "./schema/dsl/index.ts";
 import type { AnyChildEntityMap, AnyEntityMap, AnyEnumMap, AnyTypeAliasMap } from "./schema/generatedTypeHelpers.ts";
 import { type IdArgsVariant } from "./schema/generatedTypeHelpers.ts";
@@ -242,3 +242,4 @@ export declare class TSONDB<T extends DefaultTSONDBTypes = DefaultTSONDBTypes> {
 export type TSONDBWithGit<T extends DefaultTSONDBTypes = DefaultTSONDBTypes> = TSONDB<T> & {
     git: Git<T>;
 };
+export type { Config } from "./config.ts";

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

@@ -0,0 +1,5 @@
+import type { DefaultTSONDBTypes } from "./index.ts";
+import type { Schema } from "./schema/index.ts";
+export interface Output {
+    run: <T extends DefaultTSONDBTypes>(schema: Schema<T>) => Promise<void>;
+}

package/dist/src/node/renderers/jsonschema/index.d.ts

@@ -1,4 +1,4 @@
-import type { Output } from "../../../shared/output.ts";
+import type { Output } from "../../output.ts";
 import type { JsonSchemaRendererOptions } from "./render.ts";
 export declare const JsonSchemaOutput: (options: {
     targetPath: string;

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

@@ -1,4 +1,4 @@
-import type { Output } from "../../../shared/output.ts";
+import type { Output } from "../../output.ts";
 import type { TypeScriptRendererOptions } from "./render.ts";
 export declare const TypeScriptOutput: (options: {
     targetPath: string;

package/dist/src/node/schema/dsl/declarations/EntityDecl.d.ts

@@ -1,4 +1,5 @@
 import { Lazy } from "@elyukai/utils/lazy";
+import type { GenericEntityDisplayName } from "../../../../shared/schema/declarations/EntityDecl.ts";
 import { NodeKind } from "../../../../shared/schema/Node.js";
 import type { SortOrder } from "../../../../shared/schema/utils/sortOrder.ts";
 import type { UniqueConstraints } from "../../../../shared/schema/utils/uniqueConstraint.ts";
@@ -10,10 +11,6 @@ import type { MemberDecl, ObjectType } from "../types/ObjectType.ts";
 import { StringType } from "../types/StringType.ts";
 import type { BaseDecl } from "./Decl.ts";
 import { TypeAliasDecl } from "./TypeAliasDecl.ts";
-export type GenericEntityDisplayName = string | {
-    pathToLocaleMap?: string;
-    pathInLocaleMap?: string;
-} | null;
 export type EntityDisplayName<T extends TConstraint> = PathTo<T, StringType> | {
     /**
      * @default "translations"

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

@@ -3,7 +3,7 @@ import type { Decl } from "./declarations/Decl.ts";
 import type { Type } from "./types/Type.ts";
 export { Param, TypeParameter } from "./TypeParameter.ts";
 export { type Decl, type DeclP, type IncludableDeclP, type SecondaryDecl, } from "./declarations/Decl.ts";
-export { Entity, EntityDecl, type EntityDeclWithParentReference, type EntityDisplayName, type GenericEntityDisplayName, } from "./declarations/EntityDecl.ts";
+export { Entity, EntityDecl, type EntityDeclWithParentReference, type EntityDisplayName, } from "./declarations/EntityDecl.ts";
 export { Enum, EnumDecl, GenEnum, GenEnumDecl } from "./declarations/EnumDecl.ts";
 export { GenTypeAlias, GenTypeAliasDecl, TypeAlias, TypeAliasDecl, } from "./declarations/TypeAliasDecl.ts";
 export { Array, ArrayType } from "./types/ArrayType.ts";

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

@@ -3,7 +3,6 @@ import { assertExhaustive } from "@elyukai/utils/typeSafety";
 import { ENUM_DISCRIMINATOR_KEY } from "../../../shared/schema/declarations/EnumDecl.js";
 import { NodeKind } from "../../../shared/schema/Node.js";
 import { isObjectType } from "../dsl/types/ObjectType.js";
-import {} from "../dsl/types/TranslationObjectType.js";
 const formatTranslationObjectValue = (type, value) => typeof value === "object" && value !== null && !Array.isArray(value)
     ? sortObjectKeysByIndex(Object.fromEntries(Object.entries(value).map(([key, item]) => [
         key,

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

@@ -16,4 +16,4 @@ declare global {
         }
     }
 }
-export declare const createServer: (db: TSONDB, homeLayoutSections?: HomeLayoutSection[], options?: Partial<ServerOptions>, validationOptions?: Partial<ValidationOptions>, customStylesheetPath?: string) => Promise<void>;
+export declare const createServer: (db: TSONDB, homeLayoutSections?: HomeLayoutSection[], options?: Partial<ServerOptions>, validationOptions?: Partial<ValidationOptions>, customStylesheetPath?: string, customAssetsPath?: string) => void;

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

@@ -1,6 +1,5 @@
 import Debug from "debug";
 import express from "express";
-import { readdir } from "node:fs/promises";
 import { findPackageJSON } from "node:module";
 import { dirname, join } from "node:path";
 import { api } from "./api/index.js";
@@ -16,16 +15,7 @@ const staticNodeModule = (moduleName) => {
     }
     return express.static(dirname(pathToPackageJson));
 };
-const getAllJsFilesInNodeModule = async (moduleName, pathInside = []) => {
-    const pathToPackageJson = findPackageJSON(moduleName, import.meta.url);
-    if (!pathToPackageJson) {
-        throw new Error(`Could not find module "${moduleName}"`);
-    }
-    const moduleDir = dirname(pathToPackageJson);
-    const paths = await readdir(join(moduleDir, ...pathInside), { recursive: true });
-    return paths.filter(p => p.endsWith(".js")).map(p => p.replace(/\.js$/, ""));
-};
-export const createServer = async (db, homeLayoutSections, options, validationOptions, customStylesheetPath) => {
+export const createServer = (db, homeLayoutSections, options, validationOptions, customStylesheetPath, customAssetsPath) => {
     const { port } = { ...defaultOptions, ...options };
     const app = express();
     app.use(express.static(join(import.meta.dirname, "../../../../public")));
@@ -54,25 +44,6 @@ export const createServer = async (db, homeLayoutSections, options, validationOp
         next();
     });
     app.use("/api", api);
-    const importMap = JSON.stringify({
-        imports: {
-            preact: "/js/node_modules/preact/dist/preact.module.js",
-            "preact/compat": "/js/node_modules/preact/compat/dist/compat.module.js",
-            "preact/debug": "/js/node_modules/preact/debug/dist/debug.module.js",
-            "preact/devtools": "/js/node_modules/preact/devtools/dist/devtools.module.js",
-            "preact/hooks": "/js/node_modules/preact/hooks/dist/hooks.module.js",
-            "preact/jsx-runtime": "/js/node_modules/preact/jsx-runtime/dist/jsxRuntime.module.js",
-            "preact-iso": "/js/node_modules/preact-iso/src/index.js",
-            "@preact/signals": "/js/node_modules/@preact/signals/dist/signals.module.js",
-            "@preact/signals-core": "/js/node_modules/@preact/signals-core/dist/signals-core.module.js",
-            ...Object.fromEntries((await getAllJsFilesInNodeModule("@elyukai/utils", ["dist"])).map(localPath => [
-                "@elyukai/utils/" + localPath.replace(/\\/g, "/"),
-                "/js/node_modules/@elyukai/utils/dist/" + localPath.replace(/\\/g, "/") + ".js",
-            ])),
-            "@elyukai/markdown": "/js/node_modules/@elyukai/markdown/dist/src/index.js",
-            "@elyukai/markdown/types": "/js/node_modules/@elyukai/markdown/dist/src/types.js",
-        },
-    }, null, 2);
     const customStylesheetLinkHeader = customStylesheetPath
         ? `
   <link rel="stylesheet" href="/css/custom.css">`
@@ -82,6 +53,9 @@ export const createServer = async (db, homeLayoutSections, options, validationOp
             res.sendFile(customStylesheetPath);
         });
     }
+    if (customAssetsPath) {
+        app.use("/assets/custom", express.static(customAssetsPath));
+    }
     app.get(/^\/.*/, (_req, res) => {
         res.send(`<!DOCTYPE html>
 <html lang="en">
@@ -90,11 +64,10 @@ export const createServer = async (db, homeLayoutSections, options, validationOp
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>TSONDB</title>
   <link rel="stylesheet" href="/css/styles.css">${customStylesheetLinkHeader}
-  <script type="importmap">${importMap}</script>
 </head>
 <body>
   <div id="app"></div>
-  <script type="module" src="/js/client/index.js"></script>
+  <script type="module" src="/js/client/web.js"></script>
 </body>
 </html>`);
     });

package/dist/src/node/server/utils/instanceOperations.d.ts

@@ -1,6 +1,6 @@
+import type { CreatedEntityTaggedInstanceContainerWithChildInstances, UpdatedEntityTaggedInstanceContainerWithChildInstances } from "../../../shared/utils/childInstances.ts";
 import type { InstanceContainer } from "../../../shared/utils/instances.ts";
 import type { TSONDB } from "../../index.ts";
-import { type CreatedEntityTaggedInstanceContainerWithChildInstances, type UpdatedEntityTaggedInstanceContainerWithChildInstances } from "../../utils/childInstances.ts";
 export declare const createInstance: (db: TSONDB, instance: CreatedEntityTaggedInstanceContainerWithChildInstances, idQueryParam: string | undefined) => Promise<InstanceContainer>;
 export declare const updateInstance: (db: TSONDB, instance: UpdatedEntityTaggedInstanceContainerWithChildInstances) => Promise<InstanceContainer>;
 export declare const deleteInstance: (db: TSONDB, entityName: string, instanceId: string) => Promise<InstanceContainer>;

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

@@ -1,4 +1,4 @@
-import { getChildInstances, saveInstanceTree, } from "../../utils/childInstances.js";
+import { getChildInstances, saveInstanceTree } from "../../utils/childInstances.js";
 import { HTTPError } from "../../utils/error.js";
 export const createInstance = async (db, instance, idQueryParam) => {
     const getEntity = db.schema.getEntity.bind(db.schema);

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

@@ -1,33 +1,9 @@
-import type { GitFileStatus } from "../../shared/utils/git.ts";
-import type { InstanceContainer, InstanceContent } from "../../shared/utils/instances.ts";
+import type { EntityTaggedInstanceContainerWithChildInstances, UnsafeEntityTaggedInstanceContainerWithChildInstances } from "../../shared/utils/childInstances.ts";
+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";
-export interface ChildInstanceContainer {
-    id?: string;
-    content: InstanceContent;
-    gitStatus?: GitFileStatus;
-}
-export interface EntityTaggedInstanceContainer {
-    entityName: string;
-    id: string;
-    content: InstanceContent;
-}
-export interface CreatedEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<undefined, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
-}
-export interface UpdatedEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
-}
-export interface UnsafeEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string | undefined, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
-}
-export interface EntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string, EntityTaggedInstanceContainerWithChildInstances> {
-}
-export interface GenEntityTaggedInstanceContainerWithChildInstances<ID extends string | undefined, C> {
-    entityName: string;
-    id: ID;
-    content: InstanceContent;
-    childInstances: C[];
-}
 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/unique.js

@@ -1,5 +1,5 @@
 import { anySameIndices } from "@elyukai/utils/array/filters";
-import { flatCombine } from "@elyukai/utils/array/generators";
+import { flatCombine } from "@elyukai/utils/array/transformations";
 import { deepEqual } from "@elyukai/utils/equality";
 import { error, isError, mapError, ok } from "@elyukai/utils/result";
 import { getValueAtKeyPath, renderKeyPath } from "../../shared/schema/utils/keyPath.js";

package/dist/src/shared/api.d.ts

@@ -1,7 +1,15 @@
-import type { CreatedEntityTaggedInstanceContainerWithChildInstances, EntityTaggedInstanceContainerWithChildInstances, UpdatedEntityTaggedInstanceContainerWithChildInstances } from "../node/utils/childInstances.ts";
-import type { WebConfig } from "../web/context/config.ts";
 import type { SerializedDecl } from "./schema/declarations/Declaration.ts";
+import type { CreatedEntityTaggedInstanceContainerWithChildInstances, EntityTaggedInstanceContainerWithChildInstances, UpdatedEntityTaggedInstanceContainerWithChildInstances } from "./utils/childInstances.ts";
 import type { InstanceContainer, InstanceContainerOverview } from "./utils/instances.ts";
+export type WebConfig = {
+    localeEntityName: string | undefined;
+    defaultLocales: string[];
+    homeLayoutSections?: {
+        title: string;
+        comment?: string;
+        entities: string[];
+    }[];
+};
 export type GetWebConfigResponseBody = WebConfig;
 export interface GetAllDeclarationsResponseBody<D extends SerializedDecl = SerializedDecl> {
     declarations: {

package/dist/src/shared/schema/declarations/Declaration.d.ts

@@ -13,6 +13,7 @@ export declare const getSerializedTypeArgumentsRecord: <Params extends Serialize
 export type SerializedDecl = SerializedEntityDecl | SerializedEnumDecl | SerializedTypeAliasDecl;
 export type SerializedDeclP<Params extends SerializedTypeParameter[] = SerializedTypeParameter[]> = SerializedEntityDecl | SerializedEnumDecl<string, Record<string, SerializedEnumCaseDecl>, Params> | SerializedTypeAliasDecl<string, SerializedType, Params>;
 export type SerializedSecondaryDecl = SerializedEnumDecl | SerializedTypeAliasDecl | SerializedEntityDecl<string, Record<string, SerializedMemberDecl>, string>;
+export type GetDeclFromDeclName = (name: string) => SerializedSecondaryDecl | undefined;
 export interface SerializedBaseDecl<Name extends string = string, Params extends SerializedTypeParameter[] = SerializedTypeParameter[]> extends BaseNode {
     sourceUrl: string;
     name: Name;

package/dist/src/shared/schema/declarations/EntityDecl.d.ts

@@ -1,4 +1,3 @@
-import type { GenericEntityDisplayName } from "../../../node/schema/dsl/index.ts";
 import { NodeKind, type GetReferencesSerialized, type SerializedNode, type SerializedTypeArgumentsResolver } from "../Node.ts";
 import type { SerializedNestedEntityMapType } from "../types/NestedEntityMapType.ts";
 import { type SerializedMemberDecl, type SerializedObjectType } from "../types/ObjectType.ts";
@@ -6,6 +5,10 @@ import type { SerializedStringType } from "../types/StringType.ts";
 import type { SortOrder } from "../utils/sortOrder.ts";
 import type { UniqueConstraints } from "../utils/uniqueConstraint.ts";
 import type { SerializedBaseDecl } from "./Declaration.ts";
+export type GenericEntityDisplayName = string | {
+    pathToLocaleMap?: string;
+    pathInLocaleMap?: string;
+} | null;
 export type SerializedEntityDisplayName<T extends TSerializedConstraint> = SerializedPathTo<T, SerializedStringType> | {
     /**
      * @default "translations"

package/dist/src/shared/schema/types/TranslationObjectType.d.ts

@@ -4,6 +4,7 @@ import type { SerializedBaseType } from "./Type.ts";
 type TSerializedConstraint = {
     [key: string]: null | TSerializedConstraint;
 };
+export type { TSerializedConstraint as SerializedTranslationObjectTypeConstraint };
 export interface SerializedTranslationObjectType<T extends TSerializedConstraint = TSerializedConstraint> extends SerializedBaseType {
     kind: NodeKind["TranslationObjectType"];
     properties: T;
@@ -13,4 +14,3 @@ export declare const isSerializedTranslationObjectType: (node: SerializedNode) =
 export declare const resolveTypeArgumentsInSerializedTranslationObjectType: SerializedTypeArgumentsResolver<SerializedTranslationObjectType>;
 export declare const getReferencesForSerializedTranslationObjectType: GetReferencesSerialized<SerializedTranslationObjectType>;
 export declare const getSerializedTypeOfKey: <T extends TSerializedConstraint>(keyValue: null | T, parentType?: SerializedTranslationObjectType) => SerializedStringType | SerializedTranslationObjectType<T>;
-export {};

package/dist/src/shared/schema/types/Type.d.ts

@@ -1,4 +1,4 @@
-import type { GetDeclFromDeclName } from "../../../web/hooks/useSecondaryDeclarations.ts";
+import type { GetDeclFromDeclName } from "../declarations/Declaration.ts";
 import type { BaseNode } from "../Node.ts";
 import type { SerializedArrayType } from "./ArrayType.ts";
 import type { SerializedBooleanType } from "./BooleanType.ts";

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

@@ -0,0 +1,26 @@
+import type { GitFileStatus } from "./git.ts";
+import type { InstanceContent } from "./instances.ts";
+export interface ChildInstanceContainer {
+    id?: string;
+    content: InstanceContent;
+    gitStatus?: GitFileStatus;
+}
+export interface EntityTaggedInstanceContainer {
+    entityName: string;
+    id: string;
+    content: InstanceContent;
+}
+export interface CreatedEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<undefined, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
+}
+export interface UpdatedEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
+}
+export interface UnsafeEntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string | undefined, UnsafeEntityTaggedInstanceContainerWithChildInstances> {
+}
+export interface EntityTaggedInstanceContainerWithChildInstances extends GenEntityTaggedInstanceContainerWithChildInstances<string, EntityTaggedInstanceContainerWithChildInstances> {
+}
+export interface GenEntityTaggedInstanceContainerWithChildInstances<ID extends string | undefined, C> {
+    entityName: string;
+    id: ID;
+    content: InstanceContent;
+    childInstances: C[];
+}

package/dist/src/shared/utils/instances.d.ts

@@ -1,5 +1,3 @@
-import type { EntityDecl } from "../../node/schema/dsl/index.ts";
-import type { AnyChildEntityMap, AnyEntityMap, GetAllChildInstanceContainersForParent, GetEntityByName, GetInstanceContainerById } from "../../node/schema/generatedTypeHelpers.ts";
 import type { GitFileStatus } from "./git.ts";
 export type InstanceContent = object;
 export interface InstanceContainer<T = InstanceContent> {
@@ -13,4 +11,3 @@ export interface InstanceContainerOverview {
     displayName: string;
     displayNameLocaleId?: string;
 }
-export declare const getInstanceContainerOverview: <EM extends AnyEntityMap, CEM extends AnyChildEntityMap>(entity: EntityDecl, instanceContainer: InstanceContainer, getEntityByName: GetEntityByName<EM>, getInstanceById: GetInstanceContainerById<EM>, getChildInstancesForInstanceId: GetAllChildInstanceContainersForParent<CEM>, locales: string[]) => InstanceContainerOverview;

package/dist/src/shared/utils/instances.js

@@ -1,10 +1 @@
-import { getDisplayNameFromEntityInstance } from "../../node/utils/displayName.js";
-export const getInstanceContainerOverview = (entity, instanceContainer, getEntityByName, getInstanceById, getChildInstancesForInstanceId, locales) => {
-    const { content: _, ...rest } = instanceContainer;
-    const { name: displayName, localeId: displayNameLocaleId } = getDisplayNameFromEntityInstance(entity, instanceContainer, getEntityByName, getInstanceById, getChildInstancesForInstanceId, locales);
-    return {
-        ...rest,
-        displayName,
-        displayNameLocaleId,
-    };
-};
+export {};