kindstore 0.1.3 → 0.1.5

package/README.md

@@ -32,7 +32,7 @@ const Post = z.object({
 const db = kindstore({
   connection: { filename: ":memory:" },
   posts: kind("pst", Post)
-    .updatedAt("updatedAt")
+    .updatedAt()
     .index("authorId")
     .index("slug")
     .index("status")

package/dist/index.d.mts

@@ -71,6 +71,7 @@ type ConnectionConfig = {
 //#endregion
 //#region src/kind.d.ts
 type MultiIndexFields<T extends KindDefinitionBag> = { [K in keyof KindValue<T> & string]?: IndexDirection };
+type DefaultManagedTimestampField<T extends KindDefinitionBag, TName extends "createdAt" | "updatedAt"> = Extract<TName, keyof KindValue<T> & string>;
 type IndexDefinition = {
   field: string;
   type?: SqliteTypeHint;
@@ -95,10 +96,10 @@ declare class KindDefinition<T extends KindDefinitionBag> {
   }): KindDefinition<Omit<T, "indexed"> & {
     indexed: T["indexed"] | TKey;
   }>;
-  createdAt<TKey extends keyof KindValue<T> & string>(field: TKey): KindDefinition<Omit<T, "createdAt"> & {
+  createdAt<TKey extends keyof KindValue<T> & string = DefaultManagedTimestampField<T, "createdAt">>(...args: DefaultManagedTimestampField<T, "createdAt"> extends never ? [field: keyof KindValue<T> & string] : [field?: TKey]): KindDefinition<Omit<T, "createdAt"> & {
     createdAt: TKey;
   }>;
-  updatedAt<TKey extends keyof KindValue<T> & string>(field: TKey): KindDefinition<Omit<T, "updatedAt"> & {
+  updatedAt<TKey extends keyof KindValue<T> & string = DefaultManagedTimestampField<T, "updatedAt">>(...args: DefaultManagedTimestampField<T, "updatedAt"> extends never ? [field: keyof KindValue<T> & string] : [field?: TKey]): KindDefinition<Omit<T, "updatedAt"> & {
     updatedAt: TKey;
   }>;
   multi<const TName extends string, const TFields extends MultiIndexFields<T> & Record<string, IndexDirection>>(name: TName, fields: TFields): KindDefinition<Omit<T, "indexed"> & {
@@ -141,9 +142,9 @@ type KindStoreSurface<TKinds extends KindRegistry, TMetadata extends MetadataDef
   batch<TResult>(callback: () => TResult): TResult;
   close(): void;
 } & { [K in keyof TKinds]: TKinds[K] extends KindDefinition<infer TBag> ? KindCollectionSurface<TBag> : never };
-type PublicKindCollection<T extends KindDefinitionBag> = KindCollectionSurface<T>;
-type PublicMetadataCollection<T extends MetadataDefinitionMap> = MetadataSurface<T>;
-type PublicKindstore<TKinds extends KindRegistry, TMetadata extends MetadataDefinitionMap> = KindStoreSurface<TKinds, TMetadata>;
+type KindCollection<T extends KindDefinitionBag> = KindCollectionSurface<T>;
+type MetadataCollection<T extends MetadataDefinitionMap> = MetadataSurface<T>;
+type Kindstore<TKinds extends KindRegistry, TMetadata extends MetadataDefinitionMap> = KindStoreSurface<TKinds, TMetadata>;
 //#endregion
 //#region src/store.d.ts
 type AnyStoreInput = {
@@ -155,9 +156,6 @@ type InferKinds<TInput extends AnyStoreInput> = { [K in keyof TInput as K extend
 type InferMetadata<TInput extends AnyStoreInput> = TInput extends {
   metadata: infer TMetadata extends MetadataDefinitionMap;
 } ? TMetadata : {};
-type KindCollection<T extends KindDefinitionBag> = PublicKindCollection<T>;
-type MetadataCollection<T extends MetadataDefinitionMap> = PublicMetadataCollection<T>;
-type Kindstore<TKinds extends KindRegistry, TMetadata extends MetadataDefinitionMap = {}> = PublicKindstore<TKinds, TMetadata>;
 declare function kindstore<const TInput extends AnyStoreInput>(input: TInput): Kindstore<InferKinds<TInput>, InferMetadata<TInput>>;
 type MetadataSchemas = Record<string, z.ZodTypeAny>;
 //#endregion

package/dist/index.mjs

@@ -24,12 +24,14 @@ var KindDefinition = class {
 		});
 		return this;
 	}
-	createdAt(field) {
+	createdAt(...args) {
+		const field = args[0] ?? "createdAt";
 		if (field === this.updatedAtField) throw new Error(`Kind "${this.tag}" cannot use "${field}" for both createdAt and updatedAt.`);
 		this.createdAtField = field;
 		return this;
 	}
-	updatedAt(field) {
+	updatedAt(...args) {
+		const field = args[0] ?? "updatedAt";
 		if (field === this.createdAtField) throw new Error(`Kind "${this.tag}" cannot use "${field}" for both createdAt and updatedAt.`);
 		this.updatedAtField = field;
 		return this;
@@ -346,19 +348,11 @@ var KindstoreRuntime = class {
 					if (!step) throw new Error(`Kind "${definition.key}" is missing migration step ${currentVersion} -> ${currentVersion + 1}.`);
 					value = step(value, context);
 				}
-				updateRow.run(JSON.stringify(this.applyManagedTimestamps(definition, value, parsePayload(row.payload), now, false)), row.id);
+				updateRow.run(JSON.stringify(applyManagedTimestamps(definition, value, parsePayload(row.payload), now, false)), row.id);
 			}
 			this.internal.setKindVersion(definition.key, definition.definition.version);
 		})();
 	}
-	applyManagedTimestamps(definition, value, current, now, insert) {
-		const next = { ...value };
-		if (definition.createdAtField) if (current && Object.hasOwn(current, definition.createdAtField)) next[definition.createdAtField] = current[definition.createdAtField];
-		else if (insert) next[definition.createdAtField] = now;
-		else delete next[definition.createdAtField];
-		if (definition.updatedAtField) next[definition.updatedAtField] = now;
-		return definition.definition.schema.parse(next);
-	}
 };
 var KindCollectionRuntime = class {
 	database;
@@ -388,7 +382,7 @@ var KindCollectionRuntime = class {
 		assertTaggedId(this.definition.definition.tag, id);
 		return this.database.transaction(() => {
 			const row = this.getStatement.get(id);
-			const parsed = this.applyManagedTimestamps(value, row, Date.now(), !row);
+			const parsed = applyManagedTimestamps(this.definition, value, row ? parsePayload(row.payload) : void 0, Date.now(), !row);
 			this.putStatement.run(id, JSON.stringify(parsed));
 			return parsed;
 		})();
@@ -403,10 +397,10 @@ var KindCollectionRuntime = class {
 			const row = this.getStatement.get(id);
 			if (!row) return;
 			const current = this.parseRow(row);
-			const parsed = this.applyManagedTimestamps(typeof updater === "function" ? updater(current) : {
+			const parsed = applyManagedTimestamps(this.definition, typeof updater === "function" ? updater(current) : {
 				...current,
 				...updater
-			}, row, Date.now(), false);
+			}, parsePayload(row.payload), Date.now(), false);
 			this.updateStatement.run(JSON.stringify(parsed), id);
 			return parsed;
 		})();
@@ -445,15 +439,6 @@ var KindCollectionRuntime = class {
 	parseRow(row) {
 		return this.definition.definition.schema.parse(parsePayload(row.payload));
 	}
-	applyManagedTimestamps(value, row, now, insert) {
-		const current = row ? parsePayload(row.payload) : void 0;
-		const next = { ...value };
-		if (this.definition.createdAtField) if (current && Object.hasOwn(current, this.definition.createdAtField)) next[this.definition.createdAtField] = current[this.definition.createdAtField];
-		else if (insert) next[this.definition.createdAtField] = now;
-		else delete next[this.definition.createdAtField];
-		if (this.definition.updatedAtField) next[this.definition.updatedAtField] = now;
-		return this.definition.definition.schema.parse(next);
-	}
 	compileSelect(options) {
 		if (options.limit != null && (!Number.isInteger(options.limit) || options.limit < 0)) throw new Error(`Query limit for kind "${this.definition.key}" must be a non-negative integer.`);
 		const where = compileWhere(this.definition.columns, options.where);
@@ -900,6 +885,14 @@ function snapshotIndexes(definition) {
 	}
 	return indexes;
 }
+function applyManagedTimestamps(definition, value, current, now, insert) {
+	const next = { ...value };
+	if (definition.createdAtField) if (current && Object.hasOwn(current, definition.createdAtField)) next[definition.createdAtField] = current[definition.createdAtField];
+	else if (insert) next[definition.createdAtField] = now;
+	else delete next[definition.createdAtField];
+	if (definition.updatedAtField) next[definition.updatedAtField] = now;
+	return definition.definition.schema.parse(next);
+}
 //#endregion
 //#region src/store.ts
 function kindstore(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kindstore",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "A lightweight, typed document store on SQLite with Zod schemas, indexed queries, and explicit migrations.",
   "license": "MIT",
   "author": "Alec Larson",