@arcote.tech/arc 0.0.24 → 0.0.26

package/dist/collection/collection.d.ts

@@ -1,5 +1,5 @@
 import { ArcContextElement } from "../context/element";
-import type { ArcIdAny } from "../elements/id";
+import { type ArcIdAny } from "../elements/id";
 import { type ArcObjectAny } from "../elements/object";
 import { objectUtil, type DeepPartial, type util } from "../utils";
 import type { DataStorage } from "../data-storage";
@@ -74,7 +74,7 @@ export declare class ArcIndexedCollection<Name extends string, Id extends ArcIdA
     readonly indexes: I;
     constructor(name: Name, id: Id, schema: Schema, options: ArcCollectionOptions<Id, Schema>, indexes: I);
     commandContext(dataStorage: DataStorage, publishEvent: (event: this["$event"]) => Promise<void>): CollectionCommandContext<Id, Schema> & {
-        [func in keyof I]: (args: IndexValue<Schema, Indexes, I, func>) => Deserialize<Id, Schema>[];
+        [func in keyof I]: (args: objectUtil.simplify<IndexQueryArgument<objectUtil.simplify<IndexValue<Schema, Indexes, I, func>>>>) => Deserialize<Id, Schema>[];
     };
     queryBuilder(): CollectionQueryBuilder<ArcCollection<Name, Id, Schema>> & {
         [func in keyof I]: (args: objectUtil.simplify<IndexQueryArgument<objectUtil.simplify<IndexValue<Schema, Indexes, I, func>>>>) => ArcIndexedItemsQueryBuilder<ArcIndexedCollection<Name, Id, Schema, Indexes, I>>;

package/dist/elements/id.d.ts

@@ -1,10 +1,16 @@
 import type { util } from "../utils";
 import { ArcBranded } from "./branded";
 import { ArcString } from "./string";
+export declare class ArcCustomId<Brand extends string | symbol, CreateFn extends (...args: any[]) => string> extends ArcBranded<ArcString, Brand> {
+    private createFn;
+    constructor(name: Brand, createFn: CreateFn);
+    get(...args: Parameters<CreateFn>): util.GetType<this>;
+}
 export declare class ArcId<Brand extends string | symbol> extends ArcBranded<ArcString, Brand> {
     constructor(name: Brand);
     generate(): util.GetType<this>;
 }
-export type ArcIdAny = ArcId<any>;
+export type ArcIdAny = ArcId<any> | ArcCustomId<any, any>;
 export declare function id<Brand extends string | symbol>(name: Brand): ArcId<Brand>;
+export declare function customId<Brand extends string | symbol, CreateFn extends (...args: any[]) => string>(name: Brand, createFn: CreateFn): ArcCustomId<Brand, CreateFn>;
 //# sourceMappingURL=id.d.ts.map

package/dist/index.js

@@ -3,6 +3,146 @@ class ArcContextElement {
   $event;
 }
 
+// elements/optional.ts
+class ArcOptional {
+  parent;
+  constructor(parent) {
+    this.parent = parent;
+  }
+  parse(value) {
+    if (!value)
+      return null;
+    return this.parent.parse(value);
+  }
+  serialize(value) {
+    if (value)
+      return this.parent.serialize(value);
+    return null;
+  }
+  deserialize(value) {
+    if (!value)
+      return null;
+    return this.parent.deserialize(value);
+  }
+}
+
+// elements/branded.ts
+class ArcBranded {
+  parent;
+  brand;
+  constructor(parent, brand) {
+    this.parent = parent;
+    this.brand = brand;
+  }
+  serialize(value) {
+    return this.parent.serialize(value);
+  }
+  deserialize(value) {
+    return this.parent.deserialize(value);
+  }
+  parse(value) {
+    return this.parent.parse(value);
+  }
+  optional() {
+    return new ArcOptional(this);
+  }
+}
+
+// elements/default.ts
+class ArcDefault {
+  parent;
+  defaultValueOrCallback;
+  constructor(parent, defaultValueOrCallback) {
+    this.parent = parent;
+    this.defaultValueOrCallback = defaultValueOrCallback;
+  }
+  parse(value) {
+    if (value)
+      return this.parent.parse(value);
+    if (typeof this.defaultValueOrCallback === "function") {
+      return this.defaultValueOrCallback();
+    } else
+      return this.defaultValueOrCallback;
+  }
+  serialize(value) {
+    return this.parent.serialize(value);
+  }
+  deserialize(value) {
+    if (value)
+      return this.parent.deserialize(value);
+    if (typeof this.defaultValueOrCallback === "function") {
+      return this.defaultValueOrCallback();
+    } else
+      return this.defaultValueOrCallback;
+  }
+}
+
+// elements/abstract.ts
+class ArcAbstract {
+  default(defaultValueOrCallback) {
+    return new ArcDefault(this, defaultValueOrCallback);
+  }
+  optional() {
+    return new ArcOptional(this);
+  }
+  branded(name) {
+    return new ArcBranded(this, name);
+  }
+}
+
+// elements/abstract-primitive.ts
+class ArcPrimitive extends ArcAbstract {
+  constructor() {
+    super();
+  }
+  serialize(value) {
+    return value;
+  }
+  parse(value) {
+    return value;
+  }
+  deserialize(value) {
+    return value;
+  }
+}
+
+// elements/string.ts
+class ArcString extends ArcPrimitive {
+}
+function string() {
+  return new ArcString;
+}
+
+// elements/id.ts
+class ArcCustomId extends ArcBranded {
+  createFn;
+  constructor(name, createFn) {
+    super(string(), name);
+    this.createFn = createFn;
+  }
+  get(...args) {
+    return this.createFn(...args);
+  }
+}
+
+class ArcId extends ArcBranded {
+  constructor(name) {
+    super(string(), name);
+  }
+  generate() {
+    var timestamp = (new Date().getTime() / 1000 | 0).toString(16);
+    return timestamp + "xxxxxxxxxxxxxxxx".replace(/[x]/g, function() {
+      return (Math.random() * 16 | 0).toString(16);
+    }).toLowerCase();
+  }
+}
+function id(name) {
+  return new ArcId(name);
+}
+function customId(name, createFn) {
+  return new ArcCustomId(name, createFn);
+}
+
 // context/query.ts
 class ArcQuery {
   lastResult;
@@ -54,8 +194,8 @@ class QueryCollectionResult {
   constructor(result) {
     this.result = result;
   }
-  get(id) {
-    return id ? this.result.find((r) => r._id === id) : undefined;
+  get(id2) {
+    return id2 ? this.result.find((r) => r._id === id2) : undefined;
   }
   map(callbackfn) {
     return this.result.map(callbackfn);
@@ -233,10 +373,10 @@ class ArcIndexedItemsQueryBuilder extends ArcManyItemsQueryBuilder {
 
 // collection/queries/one-item.ts
 class ArcOneItemQuery extends ArcCollectionQuery {
-  id;
-  constructor(collection, id) {
+  id2;
+  constructor(collection, id2) {
     super(collection);
-    this.id = id;
+    this.id = id2;
   }
   onChange(change) {
     if (change.id !== this.id)
@@ -256,11 +396,11 @@ class ArcOneItemQuery extends ArcCollectionQuery {
 // collection/query-builders/one-item.ts
 class ArcOneItemQueryBuilder extends ArcQueryBuilder {
   collection;
-  id;
-  constructor(collection, id) {
+  id2;
+  constructor(collection, id2) {
     super();
     this.collection = collection;
-    this.id = id;
+    this.id = id2;
   }
   toQuery() {
     return new ArcOneItemQuery(this.collection, this.id);
@@ -270,13 +410,13 @@ class ArcOneItemQueryBuilder extends ArcQueryBuilder {
 // collection/collection.ts
 class ArcCollection extends ArcContextElement {
   name;
-  id;
+  id2;
   schema;
   options;
-  constructor(name, id, schema, options) {
+  constructor(name, id2, schema, options) {
     super();
     this.name = name;
-    this.id = id;
+    this.id = id2;
     this.schema = schema;
     this.options = options;
   }
@@ -295,17 +435,19 @@ class ArcCollection extends ArcContextElement {
   queryBuilder() {
     return {
       all: () => new ArcAllItemsQueryBuilder(this),
-      one: (id) => new ArcOneItemQueryBuilder(this, id)
+      one: (id2) => new ArcOneItemQueryBuilder(this, id2)
     };
   }
   commandContext(dataStorage, publishEvent) {
     const store = dataStorage.getStore(this.name);
     return {
       add: async (data) => {
-        const id = this.id.generate();
+        if (this.id instanceof ArcCustomId)
+          throw new Error("Collection with custom id not support 'add' method");
+        const id2 = this.id.generate();
         const parsed = this.schema.parse(data);
         const body = {
-          _id: id,
+          _id: id2,
           ...parsed
         };
         await store.set(body);
@@ -313,16 +455,16 @@ class ArcCollection extends ArcContextElement {
           type: "set",
           to: body
         });
-        return { id };
+        return { id: id2 };
       },
-      remove: async (id) => {
-        await store.remove(id);
+      remove: async (id2) => {
+        await store.remove(id2);
         return { success: true };
       },
-      set: async (id, data) => {
+      set: async (id2, data) => {
         const parsed = this.schema.parse(data);
         const body = {
-          _id: id,
+          _id: id2,
           ...parsed
         };
         await store.set(body);
@@ -335,12 +477,12 @@ class ArcCollection extends ArcContextElement {
       all: async () => {
         return store.findAll();
       },
-      one: async (id) => {
-        return store.findById(id);
+      one: async (id2) => {
+        return store.findById(id2);
       },
-      modify: async (id, data) => {
+      modify: async (id2, data) => {
         const deserialized = this.schema.serializePartial(data);
-        const { from, to } = await store.modify(id, deserialized);
+        const { from, to } = await store.modify(id2, deserialized);
         await publishEvent({
           type: "modify",
           changes: deserialized,
@@ -348,8 +490,8 @@ class ArcCollection extends ArcContextElement {
           to
         });
       },
-      edit: async (id, editCallback) => {
-        const { from, to } = await store.mutate(id, editCallback);
+      edit: async (id2, editCallback) => {
+        const { from, to } = await store.mutate(id2, editCallback);
         await publishEvent({
           type: "mutate",
           from,
@@ -365,8 +507,8 @@ class ArcCollection extends ArcContextElement {
 
 class ArcIndexedCollection extends ArcCollection {
   indexes;
-  constructor(name, id, schema, options, indexes) {
-    super(name, id, schema, options);
+  constructor(name, id2, schema, options, indexes) {
+    super(name, id2, schema, options);
     this.indexes = indexes;
   }
   commandContext(dataStorage, publishEvent) {
@@ -397,8 +539,8 @@ class ArcIndexedCollection extends ArcCollection {
     });
   }
 }
-function collection(name, id, schema, options = {}) {
-  return new ArcCollection(name, id, schema, options);
+function collection(name, id2, schema, options = {}) {
+  return new ArcCollection(name, id2, schema, options);
 }
 // context/context.ts
 class ArcContext {
@@ -412,16 +554,16 @@ class ArcContext {
     this.elements = elements;
     this.commands = commands;
     this.listeners = listeners;
-    this.elementsMap = Object.fromEntries(elements.map((collection3) => [collection3.name, collection3]));
+    this.elementsMap = Object.fromEntries(elements.map((element) => [element.name, element]));
   }
   queryBuilder() {
     return new Proxy({}, {
       get: (target, name) => {
-        const collection3 = this.elementsMap[name];
-        if (!collection3) {
+        const element = this.elementsMap[name];
+        if (!element) {
           throw new Error(`Collection "${name}" not found`);
         }
-        return collection3.queryBuilder();
+        return element.queryBuilder();
       }
     });
   }
@@ -522,30 +664,30 @@ class StoreState {
     };
     await this.applyChanges([change]);
   }
-  async remove(id) {
+  async remove(id2) {
     const change = {
       type: "delete",
-      id
+      id: id2
     };
     await this.applyChanges([change]);
   }
-  async modify(id, data) {
+  async modify(id2, data) {
     const change = {
       type: "modify",
-      id,
+      id: id2,
       data
     };
     const { from, to } = await this.applyChange(change);
     return { from, to };
   }
-  async mutate(id, editCallback) {
-    const object = await this.findById(id);
+  async mutate(id2, editCallback) {
+    const object = await this.findById(id2);
     const [draft, finalize] = create(object || {}, { enablePatches: true });
     await editCallback(draft);
     const [_, patches] = finalize();
     const change = {
       type: "mutate",
-      id,
+      id: id2,
       patches
     };
     const { from, to } = await this.applyChange(change);
@@ -646,12 +788,12 @@ class ForkedStoreState extends StoreState {
       this.notifyListeners(events);
     }
   }
-  async findById(id, listener) {
+  async findById(id2, listener) {
     if (listener)
-      this.listeners.set(listener, { callback: listener, id });
-    if (this.changedItems.has(id))
-      return this.changedItems.get(id);
-    return await this.master.findById(id);
+      this.listeners.set(listener, { callback: listener, id: id2 });
+    if (this.changedItems.has(id2))
+      return this.changedItems.get(id2);
+    return await this.master.findById(id2);
   }
   async findByIndex(index, data, listener) {
     if (listener)
@@ -659,16 +801,16 @@ class ForkedStoreState extends StoreState {
     const parentResult = await this.master.findByIndex(index, data);
     const results = new Map;
     parentResult.forEach((item) => results.set(item._id, item));
-    for (const [id, changedItem] of this.changedItems) {
+    for (const [id2, changedItem] of this.changedItems) {
       if (changedItem === null) {
-        results.delete(id);
+        results.delete(id2);
         continue;
       }
       const matches = Object.entries(data).every(([key, value]) => changedItem[key] === value);
       if (matches) {
-        results.set(id, changedItem);
+        results.set(id2, changedItem);
       } else {
-        results.delete(id);
+        results.delete(id2);
       }
     }
     return Array.from(results.values());
@@ -678,9 +820,9 @@ class ForkedStoreState extends StoreState {
       this.listeners.set(listener, { callback: listener });
     const parentResult = await this.master.findAll();
     return parentResult.map((item) => {
-      const id = item._id;
-      if (this.changedItems.has(id))
-        return this.changedItems.get(id);
+      const id2 = item._id;
+      if (this.changedItems.has(id2))
+        return this.changedItems.get(id2);
       return item;
     });
   }
@@ -808,19 +950,19 @@ class MasterStoreState extends StoreState {
       this.notifyListeners(events);
     }
   }
-  async findById(id, listener) {
-    if (!id)
+  async findById(id2, listener) {
+    if (!id2)
       return;
     if (listener)
-      this.listeners.set(listener, { callback: listener, id });
-    if (this.items.has(id))
-      return this.items.get(id);
+      this.listeners.set(listener, { callback: listener, id: id2 });
+    if (this.items.has(id2))
+      return this.items.get(id2);
     const transaction = await this.dataStorage.getReadTransaction();
-    const result = await transaction.findById(this.storeName, id);
+    const result = await transaction.findById(this.storeName, id2);
     const item = result && this.deserialize ? this.deserialize(result) : result;
     if (!item)
       return;
-    this.items.set(id, item);
+    this.items.set(id2, item);
     return item;
   }
   async findByIndex(index, data, listener) {
@@ -837,9 +979,9 @@ class MasterStoreState extends StoreState {
     const transaction = await this.dataStorage.getReadTransaction();
     const dbResults = await transaction.findByIndex(this.storeName, index, data);
     const results = dbResults.map((item) => {
-      const id = item._id;
-      if (this.items.has(id))
-        return this.items.get(id);
+      const id2 = item._id;
+      if (this.items.has(id2))
+        return this.items.get(id2);
       const processedItem = this.deserialize ? this.deserialize(item) : item;
       return processedItem;
     });
@@ -853,9 +995,9 @@ class MasterStoreState extends StoreState {
     const transaction = await this.dataStorage.getReadTransaction();
     const dbResults = await transaction.findAll(this.storeName);
     const items = dbResults.map((item) => {
-      const id = item._id;
-      if (this.items.has(id))
-        return this.items.get(id);
+      const id2 = item._id;
+      if (this.items.has(id2))
+        return this.items.get(id2);
       const processedItem = this.deserialize ? this.deserialize(item) : item;
       this.items.set(processedItem._id, processedItem);
       return processedItem;
@@ -908,93 +1050,6 @@ class MasterDataStorage extends DataStorage {
     await this.rtcAdapter.sync(progressCallback);
   }
 }
-// elements/optional.ts
-class ArcOptional {
-  parent;
-  constructor(parent) {
-    this.parent = parent;
-  }
-  parse(value) {
-    if (!value)
-      return null;
-    return this.parent.parse(value);
-  }
-  serialize(value) {
-    if (value)
-      return this.parent.serialize(value);
-    return null;
-  }
-  deserialize(value) {
-    if (!value)
-      return null;
-    return this.parent.deserialize(value);
-  }
-}
-
-// elements/branded.ts
-class ArcBranded {
-  parent;
-  brand;
-  constructor(parent, brand) {
-    this.parent = parent;
-    this.brand = brand;
-  }
-  serialize(value) {
-    return this.parent.serialize(value);
-  }
-  deserialize(value) {
-    return this.parent.deserialize(value);
-  }
-  parse(value) {
-    return this.parent.parse(value);
-  }
-  optional() {
-    return new ArcOptional(this);
-  }
-}
-
-// elements/default.ts
-class ArcDefault {
-  parent;
-  defaultValueOrCallback;
-  constructor(parent, defaultValueOrCallback) {
-    this.parent = parent;
-    this.defaultValueOrCallback = defaultValueOrCallback;
-  }
-  parse(value) {
-    if (value)
-      return this.parent.parse(value);
-    if (typeof this.defaultValueOrCallback === "function") {
-      return this.defaultValueOrCallback();
-    } else
-      return this.defaultValueOrCallback;
-  }
-  serialize(value) {
-    return this.parent.serialize(value);
-  }
-  deserialize(value) {
-    if (value)
-      return this.parent.deserialize(value);
-    if (typeof this.defaultValueOrCallback === "function") {
-      return this.defaultValueOrCallback();
-    } else
-      return this.defaultValueOrCallback;
-  }
-}
-
-// elements/abstract.ts
-class ArcAbstract {
-  default(defaultValueOrCallback) {
-    return new ArcDefault(this, defaultValueOrCallback);
-  }
-  optional() {
-    return new ArcOptional(this);
-  }
-  branded(name) {
-    return new ArcBranded(this, name);
-  }
-}
-
 // elements/object.ts
 class ArcObject extends ArcAbstract {
   rawShape;
@@ -1091,22 +1146,6 @@ class ArcArray extends ArcAbstract {
 function array(element) {
   return new ArcArray(element);
 }
-// elements/abstract-primitive.ts
-class ArcPrimitive extends ArcAbstract {
-  constructor() {
-    super();
-  }
-  serialize(value) {
-    return value;
-  }
-  parse(value) {
-    return value;
-  }
-  deserialize(value) {
-    return value;
-  }
-}
-
 // elements/boolean.ts
 class ArcBoolean extends ArcPrimitive {
 }
@@ -1131,28 +1170,6 @@ class ArcDate extends ArcAbstract {
 function date() {
   return new ArcDate;
 }
-// elements/string.ts
-class ArcString extends ArcPrimitive {
-}
-function string() {
-  return new ArcString;
-}
-
-// elements/id.ts
-class ArcId extends ArcBranded {
-  constructor(name) {
-    super(string(), name);
-  }
-  generate() {
-    var timestamp = (new Date().getTime() / 1000 | 0).toString(16);
-    return timestamp + "xxxxxxxxxxxxxxxx".replace(/[x]/g, function() {
-      return (Math.random() * 16 | 0).toString(16);
-    }).toLowerCase();
-  }
-}
-function id(name) {
-  return new ArcId(name);
-}
 // elements/number.ts
 class ArcNumber extends ArcPrimitive {
 }
@@ -1434,6 +1451,7 @@ export {
   number,
   id,
   date,
+  customId,
   context,
   collection,
   boolean,
@@ -1456,6 +1474,7 @@ export {
   ArcIndexedCollection,
   ArcId,
   ArcDate,
+  ArcCustomId,
   ArcCollectionQuery,
   ArcCollection,
   ArcBranded,

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "Arc is a framework designed to align code closely with business logic, streamlining development and enhancing productivity.",